From nobody Mon Jan 27 03:41:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhDjt1C7Sz5m77R; Mon, 27 Jan 2025 03:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YhDjt0Lyzz4J3F; Mon, 27 Jan 2025 03:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737949298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jDi4U0mV3v2LlxpaS4Xk2VevoxIp5oBmdi7BSYDkOwQ=; b=aW+35jNcep8B56QY3OOlaW3Sex27uOpWfOSkKx+DQOmlpacntpN30B9TJjUmh2/urekBfj FEjdoEIE/iGlRjpW0eSBErCfyH8a1m4U86xC1jNvhtWwVsVV+Ca4xC/6zs/ebYAulhq0yr cUbEl9Umjm5UIsv27FK+Rh3Qg/TDCa5tEY7LkuatbcUyNBbi1hloA/Lb8TkkF60A1qFL9c rGRj/ltS1jkSELqgTEPuqSiW4rRfQajjMTskzZa5reI67luxkJy8gh2GvLUNnCMDZjitsu nN/P1gp8XIJCX3adunzQpmlC8B5x6hGZ1dvyQUVZdG3DDsVi+dbEVGfuXghcpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737949298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jDi4U0mV3v2LlxpaS4Xk2VevoxIp5oBmdi7BSYDkOwQ=; b=FEhx6KEKVIY66vJ8OkSwAQTVfU58CQ071SWKm/NhsiI4Tqu+V+vRe5nmMspaqXzpHRL1u1 Z15HZvilgft+Qd/vL56JtFPcfqw80zfOL5kQ1QJZcE3vfVptZRTooYJP3Nm0+bgirSAVav dej224HsQOIZpnP6860fowGnIvaIy/bdUFzR7brMZ3u44/VlCD4EIstsGocYxKIRInVTck ZgxJ/dvP8dj/qbQ02oy7385+S4rN2LDYLPSkhJzP8bNfd+1ADzmgCvtfySRnVXr4r7B4pA W2r9QaZxhfyT0ct8nnuk1OWWjWQzNIarIjkC9EWztyTO4fuaMJVtXsGuSiEesA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737949298; a=rsa-sha256; cv=none; b=AUsWANagqxTBG640egHVhJ80sf7zPGuv3KvRYwdrOqC29u7X9h+QkSFz3au33+ld4K/n0r sag4CoyfYB3SfB2BQVfoCEWzJSoJeNo1kdsYVxoKp6M7ZhzNYzTa7abnIOGbEPBYiImJsS WLB65e+YjiAFLW10YL0y46dflhokpXqFkO+Xgh7EKWrj9D79ZQ1xToh/G20sdSOcn73RSH A3dYt4gpVpP2GBsGQUEgRcMNKFY8+cthle/MAE4si2263+aRBISRmVbg18/QDUoDbQLbnw LbFk3QlezyNlzXSxoEmryY6S7pB7pqZn7u1prdz8aZupQUHOCrF4DAMZCg2bqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhDjs6y6rz19kZ; Mon, 27 Jan 2025 03:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50R3fbMT064044; Mon, 27 Jan 2025 03:41:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50R3fbiv064041; Mon, 27 Jan 2025 03:41:37 GMT (envelope-from git) Date: Mon, 27 Jan 2025 03:41:37 GMT Message-Id: <202501270341.50R3fbiv064041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0eacc5c43321 - main - cam/cd: Add comments about ASC/ASCQ codes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0eacc5c4332176b63d665f91f73f8be4a4294afb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0eacc5c4332176b63d665f91f73f8be4a4294afb commit 0eacc5c4332176b63d665f91f73f8be4a4294afb Author: Warner Losh AuthorDate: 2025-01-27 03:32:37 +0000 Commit: Warner Losh CommitDate: 2025-01-27 03:35:20 +0000 cam/cd: Add comments about ASC/ASCQ codes I added these comments to da a while ago, and they seem good. Sponsored by: Netflix --- sys/cam/scsi/scsi_cd.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index 540419d4f153..d9a40544e845 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -466,6 +466,7 @@ cdasync(void *callback_arg, uint32_t code, if (xpt_path_periph(ccb->ccb_h.path) != periph && scsi_extract_sense_ccb(ccb, &error_code, &sense_key, &asc, &ascq)) { + /* 28/0: NOT READY TO READY CHANGE, MEDIUM MAY HAVE CHANGED */ if (asc == 0x28 && ascq == 0x00) disk_media_changed(softc->disk, M_NOWAIT); } @@ -1270,6 +1271,8 @@ cddone(struct cam_periph *periph, union ccb *done_ccb) * CDROM or WORM device, as long as it * doesn't return a "Logical unit not * supported" (0x25) error. + * + * 25/0: LOGICAL UNIT NOT SUPPORTED */ if ((have_sense) && (asc != 0x25) && (error_code == SSD_CURRENT_ERROR @@ -2887,13 +2890,19 @@ cderror(union ccb *ccb, uint32_t cam_flags, uint32_t sense_flags) error = cd6byteworkaround(ccb); } else if (scsi_extract_sense_ccb(ccb, &error_code, &sense_key, &asc, &ascq)) { - if (sense_key == SSD_KEY_ILLEGAL_REQUEST) + if (sense_key == SSD_KEY_ILLEGAL_REQUEST) { error = cd6byteworkaround(ccb); - else if (sense_key == SSD_KEY_UNIT_ATTENTION && - asc == 0x28 && ascq == 0x00) + } else if (sense_key == SSD_KEY_UNIT_ATTENTION && + asc == 0x28 && ascq == 0x00) { + /* 28/0: NOT READY TO READY CHANGE, MEDIUM MAY HAVE CHANGED */ disk_media_changed(softc->disk, M_NOWAIT); - else if (sense_key == SSD_KEY_NOT_READY && + } else if (sense_key == SSD_KEY_NOT_READY && asc == 0x3a && (softc->flags & CD_FLAG_SAW_MEDIA)) { + /* 3a/0: MEDIUM NOT PRESENT */ + /* 3a/1: MEDIUM NOT PRESENT - TRAY CLOSED */ + /* 3a/2: MEDIUM NOT PRESENT - TRAY OPEN */ + /* 3a/3: MEDIUM NOT PRESENT - LOADABLE */ + /* 3a/4: MEDIUM NOT PRESENT - MEDIUM AUXILIARY MEMORY ACCESSIBLE */ softc->flags &= ~CD_FLAG_SAW_MEDIA; disk_media_gone(softc->disk, M_NOWAIT); } From nobody Mon Jan 27 07:24:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhKg5687Lz5mPY2; Mon, 27 Jan 2025 07:24: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 4YhKg55lRBz3RpQ; Mon, 27 Jan 2025 07:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737962673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J6fHr0v0XPZ6RO+hqjjjBpid8B61B5dxjMA9i0bwIwg=; b=CYbj6z3WaP+TtoWVotdfX0XPAwlE4UVC+pq+F1Pf/fsz7jDc8myT77czk0xVPkCm3UAXBh 9Zi6P74x2BGRvk7BHOdlJqEUJzkuJ277fk+LdGzMGpqqnLOA3nIOGEWtwGYvLrlCxHcmXt U4U5+a0A/Wyd2v7Spiukj/qYHSgEGEmpVhcvIxhe6CzmJYFXS6pXtOru1naDOMBIsREQnY 6D7eaDu42qSFElD/24i+I9k6wcqLnl1p4DnPZS56xCHLEGaveF9xKEMpL9ayUWycAi2OpG A8jz3HcCY1dzR/nnBc4zSW8zvr8k7KrS+ozRjr0rJDQX+Bz5FWfS5ksnAZ7s+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737962673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J6fHr0v0XPZ6RO+hqjjjBpid8B61B5dxjMA9i0bwIwg=; b=ar9FyIoZpK29q+SdSCEgwFDupEnHmtmZ14w9LjmwdLt+NxPj7RIHQ1uh8gwhxh9Y6Un5T/ 7+e8LOpBrXlp+fISsdaK83PfXiLgCCSZOUNde1JbHvLTSCWese+PpMcQF6np0G1NsNjLH0 1dk7XV/vaqyhP7jBLgf6CV131BaEZ8lwJ/2MWp6dcz5f/LVBcPj14cjQurjEtl6dvmqfq4 1aLYf0S912UpxTttMZK5DK6fYxTSIHSakaPjLztyfFGnzCvzgaU8B1BWnftGPkDmkF+GiJ mgq/9mRWa8JqVkXEE6LgmCaEXGwK3xI2QZOzzATFroNr6ZgpT50o5dA7cP1n4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737962673; a=rsa-sha256; cv=none; b=ACXASLE2BBkNZ2mqNglAqZA6QNRgvBprwJsLzqgA40AWta9T3zaOCqRMdrdej0GFDNuWKp itTtKMF8eCb8TBZ0CB23apIH3w/BMVe03FVA7WnfRU9RJL2NgCiisGyXoad3g4GP7dp0mN 3qZdPi4h4WC/3u0OO3AWl5Bd1bdVAhOuFD4v7x69VZIS7vuHnc20y6za0GhmRoB0w1begH zIkVuXsFQs5ZS/Quh+6p0/GHqG2kOFYTu5QTRwMeNxb+bm3gmj3SSE/tbPK5I+WGHFRL8B rrT1fcmwtv+71QKQfV8RG3OGz0faI9VhxteKuXaNaDp1Q0t4gA/U39K0vD4d0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhKg54ttSz3mb; Mon, 27 Jan 2025 07:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50R7OXi9078036; Mon, 27 Jan 2025 07:24:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50R7OXOl078033; Mon, 27 Jan 2025 07:24:33 GMT (envelope-from git) Date: Mon, 27 Jan 2025 07:24:33 GMT Message-Id: <202501270724.50R7OXOl078033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: c6767dc1f236 - main - zfs: merge openzfs/zfs@34205715e List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6767dc1f236f20eecd75790afd42829345153da Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=c6767dc1f236f20eecd75790afd42829345153da commit c6767dc1f236f20eecd75790afd42829345153da Merge: 0eacc5c43321 34205715e154 Author: Martin Matuska AuthorDate: 2025-01-27 07:21:29 +0000 Commit: Martin Matuska CommitDate: 2025-01-27 07:22:28 +0000 zfs: merge openzfs/zfs@34205715e Notable upstream pull request merges: #16938 2aa3fbe76 zinject: count matches and injections for each handler #16947 -multiple zinject: add "probe" device injection type #16976 34205715e FreeBSD: Add setting of the VFCF_FILEREV flag Obtained from: OpenZFS OpenZFS commit: 34205715e1544d343f9a64149b17c371282306ae sys/contrib/openzfs/RELEASES.md | 2 +- sys/contrib/openzfs/cmd/zinject/zinject.c | 125 +++-- sys/contrib/openzfs/include/sys/sa.h | 8 +- sys/contrib/openzfs/include/sys/zfs_ioctl.h | 23 +- sys/contrib/openzfs/man/man4/zfs.4 | 8 +- sys/contrib/openzfs/man/man7/vdevprops.7 | 2 +- sys/contrib/openzfs/man/man7/zpool-features.7 | 4 +- sys/contrib/openzfs/man/man8/zfs-destroy.8 | 2 +- sys/contrib/openzfs/man/man8/zfs.8 | 2 +- sys/contrib/openzfs/man/man8/zinject.8 | 23 +- sys/contrib/openzfs/man/man8/zpool-initialize.8 | 2 +- sys/contrib/openzfs/man/man8/zpool-status.8 | 2 +- sys/contrib/openzfs/module/Makefile.in | 1 + .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 10 +- sys/contrib/openzfs/module/zfs/zio_inject.c | 100 +++- sys/contrib/openzfs/tests/runfiles/common.run | 2 +- sys/contrib/openzfs/tests/zfs-tests/Makefile.am | 1 + .../openzfs/tests/zfs-tests/include/kstat.shlib | 516 +++++++++++++++++++++ .../openzfs/tests/zfs-tests/include/libtest.shlib | 43 +- .../openzfs/tests/zfs-tests/tests/Makefile.am | 2 + .../tests/functional/arc/dbufstats_001_pos.ksh | 13 +- .../tests/functional/cache/cache_012_pos.ksh | 4 +- .../functional/cli_root/zdb/zdb_objset_id.ksh | 17 +- .../functional/cli_root/zinject/zinject_counts.ksh | 142 ++++++ .../functional/cli_root/zinject/zinject_probe.ksh | 75 +++ .../compression/l2arc_compressed_arc.ksh | 4 +- .../compression/l2arc_compressed_arc_disabled.ksh | 4 +- .../functional/compression/l2arc_encrypted.ksh | 4 +- .../l2arc_encrypted_no_compressed_arc.ksh | 4 +- .../tests/functional/deadman/deadman_sync.ksh | 6 +- .../zfs-tests/tests/functional/direct/dio.kshlib | 73 +-- .../tests/functional/direct/dio_read_verify.ksh | 8 +- .../functional/direct/dio_unaligned_filesize.ksh | 8 +- .../functional/direct/dio_write_stable_pages.ksh | 4 +- .../tests/functional/direct/dio_write_verify.ksh | 12 +- .../functional/fadvise/fadvise_sequential.ksh | 8 +- .../functional/fault/suspend_on_probe_errors.ksh | 6 +- .../functional/fault/suspend_resume_single.ksh | 6 +- .../tests/functional/l2arc/l2arc_arcstats_pos.ksh | 20 +- .../tests/functional/l2arc/l2arc_l2miss_pos.ksh | 6 +- .../tests/functional/l2arc/l2arc_mfuonly_pos.ksh | 4 +- .../functional/l2arc/persist_l2arc_001_pos.ksh | 2 +- .../functional/l2arc/persist_l2arc_002_pos.ksh | 2 +- .../functional/l2arc/persist_l2arc_003_neg.ksh | 7 +- .../functional/l2arc/persist_l2arc_004_pos.ksh | 2 +- .../functional/l2arc/persist_l2arc_005_pos.ksh | 2 +- .../zfs-tests/tests/functional/mmp/mmp.kshlib | 8 +- .../functional/mmp/mmp_write_distribution.ksh | 3 +- .../tests/functional/mmp/mmp_write_slow_disk.ksh | 5 +- .../functional/mount/umount_unlinked_drain.ksh | 16 +- .../zfs-tests/tests/functional/trim/trim_l2arc.ksh | 4 +- sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 53 files changed, 1061 insertions(+), 302 deletions(-) diff --cc sys/contrib/openzfs/tests/zfs-tests/include/kstat.shlib index 000000000000,c7615760592f..c7615760592f mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/include/kstat.shlib +++ b/sys/contrib/openzfs/tests/zfs-tests/include/kstat.shlib diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zinject/zinject_counts.ksh index 000000000000,19b223aba46c..19b223aba46c mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zinject/zinject_counts.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zinject/zinject_counts.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zinject/zinject_probe.ksh index 000000000000,22537a54db73..22537a54db73 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zinject/zinject_probe.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zinject/zinject_probe.ksh diff --cc sys/modules/zfs/zfs_config.h index afd68fc026d4,000000000000..b6cb1ab0652e mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,826 -1,0 +1,826 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* __assign_str() has one arg */ +/* #undef HAVE_1ARG_ASSIGN_STR */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* backtrace() is available */ +/* #undef HAVE_BACKTRACE */ + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_nr_bytes() is available */ +/* #undef HAVE_BDEV_NR_BYTES */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* struct queue_limits has a features field */ +/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* backing_dev_info is available through queue gendisk */ +/* #undef HAVE_BLK_QUEUE_DISK_BDI */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* 3-arg dequeue_signal() takes a type argument */ +/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* file->f_version exists */ +/* #undef HAVE_FILE_F_VERSION */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* GENHD_FL_EXT_DEVT flag is available */ +/* #undef HAVE_GENHD_FL_EXT_DEVT */ + +/* GENHD_FL_NO_PART flag is available */ +/* #undef HAVE_GENHD_FL_NO_PART */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* iter_is_ubuf() is available */ +/* #undef HAVE_ITER_IS_UBUF */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel defines intptr_t */ +/* #undef HAVE_KERNEL_INTPTR_T */ + +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* strlcpy() exists */ +/* #undef HAVE_KERNEL_STRLCPY */ + +/* kernel has kmap_local_page */ +/* #undef HAVE_KMAP_LOCAL_PAGE */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [unwind] */ +/* #undef HAVE_LIBUNWIND */ + +/* libunwind has unw_get_elf_filename */ +/* #undef HAVE_LIBUNWIND_ELF */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* building against unsupported kernel version */ +/* #undef HAVE_LINUX_EXPERIMENTAL */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Define to 1 if you have the 'mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* PG_error flag is available */ +/* #undef HAVE_MM_PAGE_FLAG_ERROR */ + +/* page_mapping() is available */ +/* #undef HAVE_MM_PAGE_MAPPING */ + +/* page_size() is available */ +/* #undef HAVE_MM_PAGE_SIZE */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* pin_user_pages_unlocked() is available */ +/* #undef HAVE_PIN_USER_PAGES_UNLOCKED */ + +/* proc_handler ctl_table arg is const */ +/* #undef HAVE_PROC_HANDLER_CTL_TABLE_CONST */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_sz exists */ +/* #undef HAVE_REGISTER_SYSCTL_SZ */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the 'strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* have super_block s_shrink */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK */ + +/* have super_block s_shrink pointer */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK_PTR */ + +/* sync_blockdev() is declared in include/blkdev.h */ +/* #undef HAVE_SYNC_BLOCKDEV */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the 'udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* migrate_folio exists */ +/* #undef HAVE_VFS_MIGRATE_FOLIO */ + +/* address_space_operations->readpages exists */ +/* #undef HAVE_VFS_READPAGES */ + +/* read_folio exists */ +/* #undef HAVE_VFS_READ_FOLIO */ + +/* fops->remap_file_range() is available */ +/* #undef HAVE_VFS_REMAP_FILE_RANGE */ + +/* __set_page_dirty_nobuffers exists */ +/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */ + +/* splice_copy_file_range() is available */ +/* #undef HAVE_VFS_SPLICE_COPY_FILE_RANGE */ + +/* __vmalloc page flags exists */ +/* #undef HAVE_VMALLOC_PAGE_KERNEL */ + +/* int (*writepage_t)() takes struct folio* */ +/* #undef HAVE_WRITEPAGE_T_FOLIO */ + +/* xattr_handler->get() wants dentry and inode and flags */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */ + +/* xattr_handler->set() wants both dentry and inode */ +/* #undef HAVE_XATTR_SET_DENTRY_INODE */ + +/* xattr_handler->set() takes mnt_idmap */ +/* #undef HAVE_XATTR_SET_IDMAP */ + +/* xattr_handler->set() takes user_namespace */ +/* #undef HAVE_XATTR_SET_USERNS */ + +/* Define if host toolchain supports XSAVE */ +#define HAVE_XSAVE 1 + +/* Define if host toolchain supports XSAVEOPT */ +#define HAVE_XSAVEOPT 1 + +/* Define if host toolchain supports XSAVES */ +#define HAVE_XSAVES 1 + +/* ZERO_PAGE() is GPL-only */ +/* #undef HAVE_ZERO_PAGE_GPL_ONLY */ + +/* Define if you have [z] */ +#define HAVE_ZLIB 1 + +/* kernel exports FPU functions */ +/* #undef KERNEL_EXPORTS_X86_FPU */ + +/* TBD: fetch(3) support */ +#if 0 +/* whether the chosen libfetch is to be loaded at run-time */ +#define LIBFETCH_DYNAMIC 1 + +/* libfetch is fetch(3) */ +#define LIBFETCH_IS_FETCH 1 + +/* libfetch is libcurl */ +#define LIBFETCH_IS_LIBCURL 0 + +/* soname of chosen libfetch */ +#define LIBFETCH_SONAME "libfetch.so.6" +#endif + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* make_request_fn() return type */ +/* #undef MAKE_REQUEST_FN_RET */ + +/* using complete_and_exit() instead */ +/* #undef SPL_KTHREAD_COMPLETE_AND_EXIT */ + +/* Defined for legacy compatibility. */ +#define SPL_META_ALIAS ZFS_META_ALIAS + +/* Defined for legacy compatibility. */ +#define SPL_META_RELEASE ZFS_META_RELEASE + +/* Defined for legacy compatibility. */ +#define SPL_META_VERSION ZFS_META_VERSION + +/* pde_data() is PDE_DATA() */ +/* #undef SPL_PDE_DATA */ + +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define SYSTEM_FREEBSD 1 + +/* True if ZFS is to be compiled for a Linux system */ +/* #undef SYSTEM_LINUX */ + +/* Version number of package */ +/* #undef ZFS_DEBUG */ + +/* /dev/zfs minor */ +/* #undef ZFS_DEVICE_MINOR */ + +/* Define the project alias string. */ - #define ZFS_META_ALIAS "zfs-2.3.99-158-FreeBSD_gfae4c664a" ++#define ZFS_META_ALIAS "zfs-2.3.99-170-FreeBSD_g34205715e" + +/* Define the project author. */ +#define ZFS_META_AUTHOR "OpenZFS" + +/* Define the project release date. */ +/* #undef ZFS_META_DATA */ + +/* Define the maximum compatible kernel version. */ +#define ZFS_META_KVER_MAX "6.12" + +/* Define the minimum compatible kernel version. */ +#define ZFS_META_KVER_MIN "4.18" + +/* Define the project license. */ +#define ZFS_META_LICENSE "CDDL" + +/* Define the libtool library 'age' version information. */ +/* #undef ZFS_META_LT_AGE */ + +/* Define the libtool library 'current' version information. */ +/* #undef ZFS_META_LT_CURRENT */ + +/* Define the libtool library 'revision' version information. */ +/* #undef ZFS_META_LT_REVISION */ + +/* Define the project name. */ +#define ZFS_META_NAME "zfs" + +/* Define the project release. */ - #define ZFS_META_RELEASE "158-FreeBSD_gfae4c664a" ++#define ZFS_META_RELEASE "170-FreeBSD_g34205715e" + +/* Define the project version. */ +#define ZFS_META_VERSION "2.3.99" + +/* count is located in percpu_ref.data */ +/* #undef ZFS_PERCPU_REF_COUNT_IN_DATA */ diff --cc sys/modules/zfs/zfs_gitrev.h index 990e0f51e04f,000000000000..0a2a21e6ddf1 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@@ -1,1 -1,0 +1,1 @@@ - #define ZFS_META_GITREV "zfs-2.3.99-158-gfae4c664a" ++#define ZFS_META_GITREV "zfs-2.3.99-170-g34205715e" From nobody Mon Jan 27 13:28:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhTkm1Q1lz5ldRH; Mon, 27 Jan 2025 13:28: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 4YhTkm0jp1z4663; Mon, 27 Jan 2025 13:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737984496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h0ofHql0BTm2o0hUSN9ewNNkHYDMsjj9hMeAt5mc49I=; b=iA3OFp4cTzisbq8f8L7QJTi24+CEAHyCmJ2ubDmEFArJlNTlck+fEFKPrfLre2syhDloio 3QgHNC98ma9X0oaeWeunyFW7NndAFMGUlpjBnlz5BgRZqJ9Qk3byCGuKzdWjXgoC035RsP 829y/wUd1OB0OAOKCEsasHaYHIJPUcTMKuuTRfdgvs1KRhhQ5AuYrexsPgknhAiyi7wMZ/ ymsiBfG6HGRVQnyYciRaTWySz9A8GQLEmejw+O46clf+PnDr4jag8BAykj4VxJxhrZ2Zk1 xRzXzWtNH/NnqTAf94/YVFuljfTNGOQqFg57Ddf4ZUl6i98xiZpwdlz+UiqQzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737984496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h0ofHql0BTm2o0hUSN9ewNNkHYDMsjj9hMeAt5mc49I=; b=B0mVh8kGO5s/5YBbqUAK9cTIWe2mO+9Iklbxjbw1isrkn/l2fNeOkbtMnFVhDDd0x3idkM WzSXNt6GmPRep57FSlC43w7TkpcjCFy6TbZm40KWi5OZOF9nkPSWThEuO2TgPYlbg+hwRF ELUNHQkvuLYmztxIJSN/f5hU8Ho9tzBnd/pkGIvOp//dV0QIHcFLk3KNgyGX6UM0f3kN9j W65aOTdV9F9rhfSDoCRdbwGjQhbhtW10lQW+tICyKx0lfmSGjMhDfN82jnkcZ+ofiz+O5m K7O0hPDRWfbKpb2jhBTRrTSaAsU+w4hTlhHPE2LF0Vj1AMH7dDvkl2qJBUlaFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737984496; a=rsa-sha256; cv=none; b=ycDSzBUrx7kXqJhoGywZ+nM2fuHgJYYzenFERxZcGISC+D0bFiaJbUL5jw7qgurJ11FRzh 6b+iAymu1rgQLfrOSqkSVz4qrR73r/1X1xUwYvYeCckIwfr1OMY6dpExp7gOaIVlB7LoE/ Bptlps78zwWvz7JlIRsxdxd+eqXjJTaIcye9Jj5+q5EQhCzn+tfpzZ8cYLl9Bq4pxS/ZfD uA3nYOYomh5N1Mq1Bf3NFyXVmoT90OeGbBet9XAZT3JXCP2JzomjgNZM1N/xhOloGqY/Uk QvPrLfM4tbEzYsFCFc26SL9VHSJsGSddFBRrjEfSVfFcNKwM1+eaCudYSgZPHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhTkm0GhjzTpL; Mon, 27 Jan 2025 13:28: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 50RDSFJ3050601; Mon, 27 Jan 2025 13:28:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RDSFvs050598; Mon, 27 Jan 2025 13:28:15 GMT (envelope-from git) Date: Mon, 27 Jan 2025 13:28:15 GMT Message-Id: <202501271328.50RDSFvs050598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4ae0fa8a2f8b - main - ng_hci: add support for Bluetooth Secure Simple Pairing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ae0fa8a2f8bff9a5e96dbfd862b03172c88e697 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4ae0fa8a2f8bff9a5e96dbfd862b03172c88e697 commit 4ae0fa8a2f8bff9a5e96dbfd862b03172c88e697 Author: Andreas Kempe AuthorDate: 2025-01-27 13:20:27 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-01-27 13:27:28 +0000 ng_hci: add support for Bluetooth Secure Simple Pairing Add additional messages that allow for secure simple pairing. PR: 265066 MFC after: 2 weeks Sponsored by: The FreeBSD Foundation (review and commit) --- sys/netgraph/bluetooth/hci/ng_hci_cmds.c | 2 + sys/netgraph/bluetooth/hci/ng_hci_evnt.c | 2 + sys/netgraph/bluetooth/include/ng_hci.h | 78 ++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c index 897a8ed2e917..489ad3a01ee3 100644 --- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c +++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c @@ -614,8 +614,10 @@ process_hc_baseband_params(ng_hci_unit_p unit, u_int16_t ocf, case NG_HCI_OCF_READ_LOCAL_NAME: case NG_HCI_OCF_READ_UNIT_CLASS: case NG_HCI_OCF_WRITE_UNIT_CLASS: + case NG_HCI_OCF_WRITE_SIMPLE_PAIRING: case NG_HCI_OCF_READ_LE_HOST_SUPPORTED: case NG_HCI_OCF_WRITE_LE_HOST_SUPPORTED: + case NG_HCI_OCF_WRITE_SECURE_CONNECTIONS_HOST_SUPPORT: /* These do not need post processing */ break; diff --git a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c index 7d7e1688dcbf..b6836b8843d7 100644 --- a/sys/netgraph/bluetooth/hci/ng_hci_evnt.c +++ b/sys/netgraph/bluetooth/hci/ng_hci_evnt.c @@ -120,6 +120,8 @@ ng_hci_process_event(ng_hci_unit_p unit, struct mbuf *event) case NG_HCI_EVENT_VENDOR: case NG_HCI_EVENT_REMOTE_NAME_REQ_COMPL: case NG_HCI_EVENT_READ_REMOTE_VER_INFO_COMPL: + case NG_HCI_EVENT_IO_CAPABILITY_REQUEST: + case NG_HCI_EVENT_SIMPLE_PAIRING_COMPLETE: /* These do not need post processing */ NG_FREE_M(event); break; diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h index e4d33d8661ba..44a14e62f4ed 100644 --- a/sys/netgraph/bluetooth/include/ng_hci.h +++ b/sys/netgraph/bluetooth/include/ng_hci.h @@ -114,6 +114,8 @@ #define NG_HCI_LMP_FLOW_CONTROL_LAG0 0x10 #define NG_HCI_LMP_FLOW_CONTROL_LAG1 0x20 #define NG_HCI_LMP_FLOW_CONTROL_LAG2 0x40 +/* ------------------- byte 6 --------------------*/ +#define NG_HCI_LMP_SECURE_SIMPLE_PAIRING 0x08 /* Link types */ #define NG_HCI_LINK_SCO 0x00 /* Voice */ @@ -860,6 +862,50 @@ typedef struct { } __attribute__ ((packed)) ng_hci_read_clock_offset_cp; /* No return parameter(s) */ +#define NG_HCI_IO_CAPABILITY_REQUEST_REPLY 0x002b +typedef struct { + bdaddr_t bdaddr; + u_int8_t io_capability; + u_int8_t oob_data_present; + u_int8_t authentication_requirements; +} __attribute__ ((packed)) ng_hci_io_capability_request_reply_cp; + +typedef struct { + u_int8_t status; + bdaddr_t bdaddr; +} __attribute__ ((packed)) ng_hci_io_capability_request_reply_rp; + +#define NG_HCI_USER_CONFIRMATION_REQUEST_REPLY 0x002c +typedef struct { + bdaddr_t bdaddr; +} __attribute__ ((packed)) ng_hci_user_confirmation_request_reply_cp; + +typedef struct { + u_int8_t status; + bdaddr_t bdaddr; +} __attribute__ ((packed)) ng_hci_user_confirmation_request_reply_rp; + +#define NG_HCI_USER_CONFIRMATION_REQUEST_NEGATIVE_REPLY 0x002d +typedef struct { + bdaddr_t bdaddr; +} __attribute__((packed)) ng_hci_user_confirmation_request_negative_reply_cp; + +typedef struct { + u_int8_t status; + bdaddr_t bdaddr; +} __attribute__ ((packed)) ng_hci_user_confirmation_request_negative_reply_rp; + +#define NG_HCI_IO_CAPABILITY_REQUEST_NEGATIVE_REPLY 0x0034 +typedef struct { + bdaddr_t bdaddr; + u_int8_t reason; +} __attribute__ ((packed)) ng_hci_io_capability_request_negative_reply_cp; + +typedef struct { + u_int8_t status; + bdaddr_t bdaddr; +} __attribute__ ((packed)) ng_hci_io_capability_request_negative_reply_rp; + /************************************************************************** ************************************************************************** ** Link policy commands and return parameters @@ -1374,6 +1420,13 @@ typedef struct { typedef ng_hci_status_rp ng_hci_write_page_scan_rp; +#define NG_HCI_OCF_WRITE_SIMPLE_PAIRING 0x0056 +typedef struct { + u_int8_t simple_pairing; /* 1 -> enabled, 0 -> disabled */ +} __attribute__ ((packed)) ng_hci_write_simple_pairing_cp; + +typedef ng_hci_status_rp ng_hci_write_simple_pairing_rp; + #define NG_HCI_OCF_READ_LE_HOST_SUPPORTED 0x6c typedef struct { u_int8_t status; /* 0x00 - success */ @@ -1389,6 +1442,13 @@ typedef struct { typedef ng_hci_status_rp ng_hci_write_le_host_supported_rp; +#define NG_HCI_OCF_WRITE_SECURE_CONNECTIONS_HOST_SUPPORT 0x007a +typedef struct { + u_int8_t support; /* 0 - disabled, 1 - enabled */ +} __attribute__ ((packed)) ng_hci_write_secure_connections_host_support_cp; + +typedef ng_hci_status_rp ng_hci_write_secure_connections_host_support_rp; + /************************************************************************** ************************************************************************** ** Informational commands and return parameters @@ -2025,6 +2085,24 @@ typedef struct { bdaddr_t bdaddr; /* destination address */ u_int8_t page_scan_rep_mode; /* page scan repetition mode */ } __attribute__ ((packed)) ng_hci_page_scan_rep_mode_change_ep; + +#define NG_HCI_EVENT_IO_CAPABILITY_REQUEST 0x31 +typedef struct { + bdaddr_t bdaddr; +} __attribute__ ((packed)) ng_hci_io_capability_request_ep; + +#define NG_HCI_EVENT_USER_CONFIRMATION_REQUEST 0x33 +typedef struct { + bdaddr_t bdaddr; + u_int32_t numeric_value; +} __attribute__ ((packed)) ng_hci_user_confirmation_request_ep; + +#define NG_HCI_EVENT_SIMPLE_PAIRING_COMPLETE 0x36 +typedef struct { + u_int8_t status; + bdaddr_t bdaddr; +} __attribute__ ((packed)) ng_hci_simple_pairing_complete_ep; + #define NG_HCI_EVENT_LE 0x3e typedef struct { u_int8_t subevent_code; From nobody Mon Jan 27 15:56:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhY1R6lcXz5ls9g; Mon, 27 Jan 2025 15:56: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 4YhY1R69ckz3R3k; Mon, 27 Jan 2025 15:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737993371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+SWaHyM9g+DqSif34fM5/zlPbjhCuCBrCwNDYb2BBow=; b=YHb+6CsyrAMckv8j/0RD/zdAhsdb5OCWIIfIRNJ/vumocZb4DBotEqig5pxbG+vF2tGMSb oicOv9zLtVFZmFrYREtC8Q4DknZsm4oiA51Y/lv/GatL0ZtmtPIWk0sP5+A3ZvKZ+h+7tA tzxIwLt2p3vo4slhk9+k537R/pykGfH9SE9Q/bcG+i8+zScvfaKIrWnBmGACilD9UEfpSf goNoKrZE0lquSkgqjVQyFAlSevZ1yHzXMFKVyc721/3sb+VQzP4J3Og7l+deE4h2ElQL9n Yeyoo/CEboam1G+fSgLLbg+75KdTk2wSY9NPWkkYmznyTrgje5/L+NxsELJj4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737993371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+SWaHyM9g+DqSif34fM5/zlPbjhCuCBrCwNDYb2BBow=; b=oUeAvDJFGnzz9LNazN144TSAo/8zl0NWcmWZEhh7xpYNqfCQGTnwEntOPlU9/ldpP3gQ9R 7PlHi1iIn83sZEEzK4dQ/bp+l4Oh39WiTuW2dy6QmEvcMEmsGnaN+3UM3iEE9ZFala08oI H+P5caMtyGSQijkNyFk7ICoyjwfj87/yasf+4ObYQE8E5ihJzN1007akI1x4d5c2dfFmYC c9U6YBeG6W+wNiGi4W8IRfEXHvYP9tYniipFLrIelcrpj5uv4vRjr6XQQ8vpRPdyWbpPxX NbEOb8ab2RLgDDX+oVGGUJjRhGXqn/XSGYdHEX82L+LmebiCtrzVhW/Lt+mqUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737993371; a=rsa-sha256; cv=none; b=wu2VYF8/2nfY2J4NANUkVDye9p7q6yLEzpu32BnYeRwNQEkljQSeLTw4O7312onaxS00I6 6BAWmppVKdR+glnMgQDKkr0iSIXYSe+UdyvdJTprikxNca5KFfQpPIygH+WoHtrNmFHlQD Uvaeg5XzKvc+xrtV5b5fkVnfCwtk1l2xC/PCKnqzeCAkY1x92eFYA2rVUlq0Y/Uw5T1Iof LBCeRqmjV171CEU1vYiL6yOHkMddALfe7/in7a8V802n4zfovIUNf2NFsQirbv6oW0LpAK a9ap/euOkfHI6wtNgDgltvBf+JR2GaXxUXkPtJOtbioVboWPsC2wz0exl0yu3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhY1R5lcQzbx5; Mon, 27 Jan 2025 15:56: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 50RFuBjN029389; Mon, 27 Jan 2025 15:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RFuBDA029386; Mon, 27 Jan 2025 15:56:11 GMT (envelope-from git) Date: Mon, 27 Jan 2025 15:56:11 GMT Message-Id: <202501271556.50RFuBDA029386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 92632371b360 - main - if_vxlan(4): Prefer SYSCTL_INT over TUNABLE_INT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92632371b360010709fad60146f1aee0b8b99776 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=92632371b360010709fad60146f1aee0b8b99776 commit 92632371b360010709fad60146f1aee0b8b99776 Author: Zhenlei Huang AuthorDate: 2025-01-27 15:54:43 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-27 15:54:43 +0000 if_vxlan(4): Prefer SYSCTL_INT over TUNABLE_INT This driver does not need to retrieve those tunable during early boot. Meanwhile SYSCTL_INT can provide rich info such as description. Also `sysctl net.link.vxlan.[legacy_port|reuse_port]` can report the current settings. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48621 --- sys/net/if_vxlan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 58285c632771..03184c1fb678 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -429,9 +429,11 @@ SYSCTL_NODE(_net_link, OID_AUTO, vxlan, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Virtual eXtensible Local Area Network"); static int vxlan_legacy_port = 0; -TUNABLE_INT("net.link.vxlan.legacy_port", &vxlan_legacy_port); +SYSCTL_INT(_net_link_vxlan, OID_AUTO, legacy_port, CTLFLAG_RDTUN, + &vxlan_legacy_port, 0, "Use legacy port"); static int vxlan_reuse_port = 0; -TUNABLE_INT("net.link.vxlan.reuse_port", &vxlan_reuse_port); +SYSCTL_INT(_net_link_vxlan, OID_AUTO, reuse_port, CTLFLAG_RDTUN, + &vxlan_reuse_port, 0, "Re-use port"); /* * This macro controls the default upper limitation on nesting of vxlan From nobody Mon Jan 27 17:06:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhZZs0bXmz5lxwQ; Mon, 27 Jan 2025 17:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YhZZr6xfQz3bP6; Mon, 27 Jan 2025 17:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737997605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v6mpHWHKBB3f8HY+/myPza7ETmo7beoS8Kr1qWjVqAg=; b=c6YdAKQVYya15tXDygFc7mWw9sBcVSBg8oJ78iTi8yT2DcEC1MpmCVAsYWc8W2to51Ojjk va/11JPeg+uiIPviGRz7XqKVr8ib2kacR03ShgGUqMpDgQx6dz/lw+9rJ5ILPeOv4k1WoA 82iQlyB4i8953BQHjfPt6cl6pHsyMno3ubvio56J4un6mkkT6VYAXRSbVSp0I8hn+CkXiv 2z4dzYAe643O3QnCSxNoy0JTDv9VtbQl/LA+1Aph+msdNMVnFVJMaHs7regEYWD39FqmBc Y9nLLeIJNGqSjDx1yPQkzkbvJ4v/r6ga3VduxiZFBLDRzXnttIaU2t1Eigo2wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737997605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v6mpHWHKBB3f8HY+/myPza7ETmo7beoS8Kr1qWjVqAg=; b=qZrraMSCxP7fyJ2CWxsnBmU6lmDYJJEsAU1QCFIbjwqRo1FxXgk8pOQf1p1bkp053EmoH8 IlW+Jjc84xVFj1jhuB0hnUIycG9/AhRIOPHI7Z56izyrWKWpN4Up3s4qRS2RmCwx2br/Mi UqSXd5aD84BMw6A2RaAhMYjgFbf8+fRMBn1x/Nlk8x8EkVKHZM4h0V7ESIT6KufgoEqtvu ZlleF4kgkCTeScDowPcIFRQoykZxA8Hw/92xyze/kkOJPCSpbIUOjY3uIeAMmhToN2q6VQ sTMYgW54jms8qMyZ97DpLo+ayom7807vQPTj3vFZrryyBIMmnU+aLCsXK7bnjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737997605; a=rsa-sha256; cv=none; b=GZakDiN3P1XfhOKyBXlUwSe2qaXR0+rlaqo+L44iCqyiQumoc2v3Xh8tohdMPvpZZB8nod iOqumjS58TOVLEFmTmflPAKSKMcN28y3YUVp187auAE93xwaJNfdXtgMip4ZS12lZc53UP jqtmbL6fYDiwBeZdpmWWLiU+HNJ2SJN31NFbwPSicxuR70SGBggrMYMwD0tAFxtDmuUhh3 r51V6norUhx0vmpAVd37yzxJc2UlCU4bO/uRhkCkBqxl90XQ8yMhaDp2D9PnUVYwSzyYJB 3M+EtSXMcqCg/BS8SnNIMw0hxIkTbItcPzfEtqOL3LLx1Cxq+hrwWEQ9e3Ck9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhZZr69YwzdW2; Mon, 27 Jan 2025 17:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50RH6i9b060617; Mon, 27 Jan 2025 17:06:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RH6ikv060614; Mon, 27 Jan 2025 17:06:44 GMT (envelope-from git) Date: Mon, 27 Jan 2025 17:06:44 GMT Message-Id: <202501271706.50RH6ikv060614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8b012980b8cc - main - Revert "oce(4): deprecate" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b012980b8cc5f8619cd552ee6df7b98b97c5d62 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8b012980b8cc5f8619cd552ee6df7b98b97c5d62 commit 8b012980b8cc5f8619cd552ee6df7b98b97c5d62 Author: Ed Maste AuthorDate: 2025-01-27 16:54:20 +0000 Commit: Ed Maste CommitDate: 2025-01-27 17:06:21 +0000 Revert "oce(4): deprecate" These are reportedly still in fairly wide use. We strongly encourage folks with this hardware to post a dmesg on dmesgd.nycbug.org. This reverts commit 4591322980a37d6ee38a3ed70569366e16ca71f6. Discussed with: brooks Sponsored by: The FreeBSD Foundation --- share/man/man4/oce.4 | 8 +------- sys/dev/oce/oce_if.c | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/share/man/man4/oce.4 b/share/man/man4/oce.4 index 47b09cdd7136..a8cd9ae80734 100644 --- a/share/man/man4/oce.4 +++ b/share/man/man4/oce.4 @@ -34,7 +34,7 @@ .\" 3333 Susan Street .\" Costa Mesa, CA 92626 .\" -.Dd June 13, 2023 +.Dd January 27, 2025 .Dt OCE 4 .Os .Sh NAME @@ -55,12 +55,6 @@ module at boot time, place the following line in .Bd -literal -offset indent if_oce_load="YES" .Ed -.Sh DEPRECATION NOTICE -The -.Nm -driver may not be present in -.Fx 15.0 -and later. .Sh DESCRIPTION Emulex OneConnect adapters come in various skews and with different combinations of NIC, FCoE and iSCSI functions. diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c index 14dd5cf34a7a..1906933fa75a 100644 --- a/sys/dev/oce/oce_if.c +++ b/sys/dev/oce/oce_if.c @@ -370,8 +370,6 @@ oce_attach(device_t dev) } softc_tail = sc; - gone_in_dev(dev, 15, "relatively uncommon 10GbE NIC"); - return 0; stats_free: From nobody Mon Jan 27 19:46:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yhf7S0mrDz5m9mh; Mon, 27 Jan 2025 19:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yhf7R74r2z3BnQ; Mon, 27 Jan 2025 19:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738007204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F7//Vq4eH0ML/vJE4QNI/fQnOK4Xho0Qy66kZXQ4ESI=; b=IHz14zaSwx14tJLvFDUI7Svu6R/LJr1bm2PJB72ilghWsOFTOcEEAS2Zq654823Pm9tbK4 I80agdgoyMHL0ukXB/e4QYsOoThamdP8sW6uV7QHRP76AtF5oa/L3dt2Fgg7TlF3c22rI3 EmNzYTx3tFPRiJo9gMfU4k2lqi2d0ta2dCqoxxDwMaB4wJWlVTYPGIKN4mzfYF1TwhP4Dt JeKWDTbBWS/NYjVPNbD4bLdRhcXBupXVwhn1S2pp/hheH1K/IpDLYV/98zknloW2DdNgAr nyzBKl9JQZuKxurndhFHpMsXTYUp2TJNZY6W9AruwrsxjlB8smKsWzAa5QKNgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738007204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F7//Vq4eH0ML/vJE4QNI/fQnOK4Xho0Qy66kZXQ4ESI=; b=EkOvd8mYwzYF1IDMXi9uVRq4TvbCA3jCk4cTV0PKubeFd5n65UMdtJi+aLa08E0yL2Jh0Z xr4wr1Gx02BSPMMXvgAN2r3f3rQl9zb1HmLA38nFehThhjapt/Pm2mQWnecnqhroLKmsFF 0zZD5LcVXtHM7DDxmrIQviwIBfRyF3ZTRItI7KGTqsjn2BOUce+chz1j4Qu/kIECvTnJZ5 4Q0t3qPB1/eBbcfLN5t5xXZP7dXgWaKZxJPnsMBmEN7A8D7kTof4mDgsiDMTxcq7Ayq8eA USpbt02QHCYaBSHgfbhYt4Nr7V/1zSwvNTjgxOk2g1pdurrA+EqXdx4V5J0eGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738007204; a=rsa-sha256; cv=none; b=mudzRalbreCWdVk0DUSEG+ApRKy6PaniuHgP50bdLnUcXwHI8MHQkMs6I53jpAKuFh3xjz mp5fqbGWnOqDEl3glzcNDUvznH+LFgYWRz74gAsrf57zkuOzCXNYCIPWTU5mfmQqL0sYG6 pnW5MtNtw8Fs9C5TJ2JNYf1Zh39Pwkix/juqrQSzYtYcHtO5nt4u3OcscGLbWnupOYty1v hMZyPrm8YC3lITFDlzXzWMXfKvD/rGEwCVsiWsYpStfIe4aaBLRnggE6fbdxJmXnRZZqm9 tcrYh4Uj6p+yEhU4jEIG9Yf3dtAvUp0DkCsjqSm3OfM/qtlubrz0WaGb2YbGQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yhf7R6RLjzjs4; Mon, 27 Jan 2025 19:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50RJkhJQ060672; Mon, 27 Jan 2025 19:46:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RJkhUB060669; Mon, 27 Jan 2025 19:46:43 GMT (envelope-from git) Date: Mon, 27 Jan 2025 19:46:43 GMT Message-Id: <202501271946.50RJkhUB060669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 2f893597fcc3 - main - seq.1: Reset option list alignment + tag spdx List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f893597fcc34456d5adfc3f1633b39c76d0764f Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=2f893597fcc34456d5adfc3f1633b39c76d0764f commit 2f893597fcc34456d5adfc3f1633b39c76d0764f Author: Alexander Ziaee AuthorDate: 2025-01-27 19:37:43 +0000 Commit: Alexander Ziaee CommitDate: 2025-01-27 19:43:28 +0000 seq.1: Reset option list alignment + tag spdx This option list was tabbed over 19 characters. style.mdoc(5) asks that lists are set to the longest item, or if that's too long then to use indent. Resetting it to indent buys us two lines at MANWIDTH 80, and three at 59. MFC after: 3 days Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D48350 --- usr.bin/seq/seq.1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.bin/seq/seq.1 b/usr.bin/seq/seq.1 index 682ef269cba1..d81dc7052a3c 100644 --- a/usr.bin/seq/seq.1 +++ b/usr.bin/seq/seq.1 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" $NetBSD: seq.1,v 1.8 2013/04/07 17:37:45 jdf Exp $ .\" .\" Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -69,7 +72,7 @@ Normally integer values are printed as decimal integers. The .Nm utility accepts the following options: -.Bl -tag -width Ar +.Bl -tag -width indent .It Fl f Ar format , Fl -format Ar format Use a .Xr printf 3 From nobody Mon Jan 27 19:57:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhfMK3wXQz5mBcY; Mon, 27 Jan 2025 19:57: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 4YhfMK3DtHz3FWW; Mon, 27 Jan 2025 19: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=1738007821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s7O6Y8+VpsOfyPNN0Udlehg60357qDKG84T/WyP9FNI=; b=Yy3nDVlm0vbR5gM4c7hJ5gwyNZuXx7bFipc8291GyTciHdUA0CcsG1bhwevCnfbFn5Hfap k6wHot8z0rvtF2hyrkTgXVtL9htZYHquZt8OsOmCoYfZPfR3cHUSUIKi56DdO6zcv5wIxA in8GufrimELtlTVWvcDHJvtRuscMKPo4e8gU4uEmwXfaT45slGPyRu8bPLfNKCqf+dMocU LW0EZcg8nR+9l7Wmicj6vykMJO3C8JMHM0plovCVurzywjVkhjgQ6rMw/wBYkses6JvcqH DjZzlNOpZRoyqiaD+nwJ+aoRrB/ZI5ofP8wTGL+A/bwN4CdawNjMt1C7c7Zo8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738007821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s7O6Y8+VpsOfyPNN0Udlehg60357qDKG84T/WyP9FNI=; b=Sdlk0i7VXVAcgd7urOGkUXVXO8C+CaMCVaAQ4WFBsXmCsMpznlU9HUw9qfjplvLaJC3J3g oBKLEEORWrHFQvjlHtIGVdRKfzWYgcf+I0GgwPp43xBYKTT/6mjsGfG6TUrSlIIfA+8TQ6 iKKd83Hr7WYa81CuecalP26rGvSzsVfBhMIyaLai829+I5F0t8DknkDx3Q6O+njLvrlcfN UHoq6W53hAXjN6ku1DZgOUjlemekCkHeDP+ghPJ3wjNQOfVcCWUMmkDRmhhe4voKDC9kjp aGa/spo6WL1puE6Jwn7Lx6SkNU24BYQbSmnIi+7oYGiIqf1/yTRhePnCD2S1BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738007821; a=rsa-sha256; cv=none; b=eN3rPbE23pquBmeDULMV/IkcGAmRSRF6n3viv6FadxVRbyRwbOPZzHEY+Df7Ah0YzWxr+y bockImBIcYRnknrG7rMysFu95C9myF/WXU+VWTJa60aMgMDTkMIchB5k2NaahDC4wU0f/y pU+9kqjAiWkQ22ypisn4I/8OUaJFJADCuUtJAYKT5w+KbxiuzFpXyxlUHbIDJdB3P7TM2N xjMUFl+2DVWtWwBt/dmu+VRBRz1P3hZoE86NZoBCElrrxmBDnYk9rQY6eKfbkNLkY1oxFH U863Y3lIDsn7pscUX8QWG/QzjwGmpS8fBemON2TBvke7wKj2Hc5N9h6qME+bzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhfMK2XDCzjsR; Mon, 27 Jan 2025 19: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 50RJv1JB079684; Mon, 27 Jan 2025 19: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 50RJv1MY079681; Mon, 27 Jan 2025 19:57:01 GMT (envelope-from git) Date: Mon, 27 Jan 2025 19:57:01 GMT Message-Id: <202501271957.50RJv1MY079681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 404802777003 - main - motd.5: Mention /etc/motd + alignment polish List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 404802777003b7fb37ca8013fe938eaa4de36103 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=404802777003b7fb37ca8013fe938eaa4de36103 commit 404802777003b7fb37ca8013fe938eaa4de36103 Author: Alexander Ziaee AuthorDate: 2024-12-14 21:49:33 +0000 Commit: Alexander Ziaee CommitDate: 2025-01-27 19:55:18 +0000 motd.5: Mention /etc/motd + alignment polish + description: Space example by writing a little cleaner + files: Align files list width + explain /etc/motd link MFC after: 3 days Reviewed by: mhorne, rpokala Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D48085 --- share/man/man5/motd.5 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/share/man/man5/motd.5 b/share/man/man5/motd.5 index 5dce1ccd52ae..109fc4e56ca4 100644 --- a/share/man/man5/motd.5 +++ b/share/man/man5/motd.5 @@ -2,7 +2,7 @@ .\" .\" This file is in the public domain. .\" -.Dd October 18, 2020 +.Dd December 14, 2024 .Dt MOTD 5 .Os .Sh NAME @@ -25,9 +25,8 @@ and the contents are written to can be updated without a system reboot by manually restarting the motd service after updating .Pa /etc/motd.template : -.Bd -literal -offset indent -compact -service motd restart -.Ed +.Pp +.Dl service motd restart .Pp Individual users may suppress the display of this file by creating a file named @@ -35,7 +34,10 @@ creating a file named in their home directories or through .Xr login.conf 5 . .Sh FILES -.Bl -tag -width $HOME/.hushlogin -compact +.Bl -tag -width "/etc/motd.template" -compact +.It Pa /etc/motd +Symbolic link to +.Pa /var/run/motd . .It Pa /etc/motd.template The template file that system administrators can edit. .It Pa /var/run/motd From nobody Mon Jan 27 19:59:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhfPc6MgSz5mBpK; Mon, 27 Jan 2025 19:59: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 4YhfPc5GPSz3FnH; Mon, 27 Jan 2025 19:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738007940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9UY/nMWBEztilAHUqqaqtcnt1kaFXC7eXWJH4gtDFQE=; b=hiBHB/e3G+EJOgM8iFb2gIgah+aAqNdiRlJC1lhEBHzew4VJ8nvCsyMLcTwj8IesVsZNtX LZCsEoOY009pLcHLXPcnMVeuq5W1m2Ypbu+XOfsb9WTyg6PDFtyfDt3GH3A6GGqM0nMVnK Kbwm5d9oaD0Tx04wSdBripL/POtdMBie2M8p/SDBy4F2kve/JhqEsoY+xMbitETB22MB6l Ug4iREiqdzu33xWiHnW8GVo0yhpqVOofpOewDlGdjM6L5dU57/1AMABpGBZ/PL2ZMrEP7J phHe+0WACXOTAozNiPp2kTUq8f61liEuTZqZMx7Na0vjqprp52Nvm7pQWdKQ3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738007940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9UY/nMWBEztilAHUqqaqtcnt1kaFXC7eXWJH4gtDFQE=; b=qvXoIV5vioKObyOJL3ssoAnJxenTKvB/2LtaOP6hzAr8RWjc0+DVDnvh23S9XdijSEQs2n +ep2GwZecDfQwoyGMrSfIgG8nbqHLQiZXabYwh9Y9xgJb9NUidVS0xYFcvkZsSSrK8W1yt W8739neqHWjMFy+3lWy1DnCAoEXbjEhkcYui5rcUYk2M6lLQXo6vu9aLLpDU5evwILevOl kcuIT/zN7c3cvn3dZ1IwRwHs0rq99B5cBvZKRvqdJKQxE4x3l3oDFOhmFYoP2zuhyM5jUW ngq2pll2yGWT3g4Su7jeCJcmANOiyKvA4PQEIhJ9ZavbIc8aaSM7Mk12JYtFJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738007940; a=rsa-sha256; cv=none; b=crbhnuIoGecXuELCIquD63uj2UKmKm+3bk6GSJkbHvpSxXn3mr2G4GvQ5zfpJOdxk4zDY1 laAHxtjAY3zGoy3Nd6/7Vr+hhfVAEWQJOrUR1E0OkkquKfCwNutM/rwdhPO4hIJVt36Cqq 4RwdD9MIIROR0pT4KaxFmsTNur4WKcMNSzdTtMETf6Egjsp7JXNkDhplgFNbMh2XvzyCBK /VqLXI9CEfv5/+YRDxlp69pE9bDY05a+plOKW+A/0X1COBr85Hq4vWondM4u4nnkUu+29d QT2IcucGS8ff1OccYNNyq/Y6OBmbFVGCJIS82WHG2/EykmPKduSuaTy1Hua7sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhfPc4XRfzk42; Mon, 27 Jan 2025 19:59: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 50RJx0kC080360; Mon, 27 Jan 2025 19:59:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RJx0uC080357; Mon, 27 Jan 2025 19:59:00 GMT (envelope-from git) Date: Mon, 27 Jan 2025 19:59:00 GMT Message-Id: <202501271959.50RJx0uC080357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: 582c8de016f8 - main - Fix the date for the ROCKCHIP option. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: netchild X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 582c8de016f88c74eab5b34ba3764c18df4c36e0 Auto-Submitted: auto-generated The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=582c8de016f88c74eab5b34ba3764c18df4c36e0 commit 582c8de016f88c74eab5b34ba3764c18df4c36e0 Author: Alexander Leidinger AuthorDate: 2025-01-27 19:57:52 +0000 Commit: Alexander Leidinger CommitDate: 2025-01-27 19:58:52 +0000 Fix the date for the ROCKCHIP option. --- UPDATING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 3eccd089d808..7329837c48ee 100644 --- a/UPDATING +++ b/UPDATING @@ -27,7 +27,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -20240106: +20250106: A new SOC_ROCKCHIP options appeared, so if you have a custom kernel configuration targetting Rockchip SoC you need to add it so shared and mandatory drivers for this SoC familly will be selected. From nobody Mon Jan 27 20:03:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhfVn6vWFz5mBrt; Mon, 27 Jan 2025 20:03: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 4YhfVn4PKjz3GHR; Mon, 27 Jan 2025 20:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738008209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WlJOulG8lee/Pd7+1Md2UI7ArhspBUjCIACfGO00PTs=; b=gABX3MMaJ1hkRTLqhpIoligP2MQYsZ56xisCIR15+Pn/QfwyMAqVN/l1ykadMl49xprNxS aLqi1n5dLMAV2qa9+mjAZFiEP3IPckhp4OfcQJwe8ef3kfn3pbkxGcvwgdb64mowFyJSJT jKcVaK4bSgmdcp8oqBmgC16ojiYexiCeNf7Sw72mXsu3R7aBsqPxNq8bS+Dfg7MP54Elhn tU4zFpAJJI2q2RYSOaXGSn4YSDz7pkSsMKGmqVSOcWOrhmQoL/xQY+Xc0nJbYVvvobYcpD 6x18sUw633QP6UTjd9z5sZl5YPeQKldDRxUEfd7Aq0diVsw6MudRaisHP/fe4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738008209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WlJOulG8lee/Pd7+1Md2UI7ArhspBUjCIACfGO00PTs=; b=Kx6LDxgr8dctPktxX0gHSPwWtUWXrWEM8+rWHa4wfmugfv0+nNy57igr6srRiE7wGlug9E LSYMGiZY69FNVaY/ZGFTmn244h13AnRC5Cuxp/60Xrg6AFKrI9/HTgUa4wE4/81xBlVvAX FITO/OeIW7tsUO2GSjnoYhC5iS39IiCnJ61370/kaxs9P1vw9KKsY6xshod7JllZ4vZVIM AVwnjuCKmlwWcVmiCNjBNhJa+2E5ExLlHRHisimB3PlmZ2FFDKJTiLpSi2ursJXhtkMr8D v+xRXFXfaghsTDeQ/SuUjcb0kBXlVEHNOOZw5c1a5a3wageeJDbXro3b8xHO7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738008209; a=rsa-sha256; cv=none; b=h/FCoe4RaTbbDOXAwe+byvIR+gd0wx9r1SH3kXZQxO/UyDMLLC6rs5N8Fr0WRRsS0qdNwv vMc2iDdAjlTldvR3OKjrvvTvGg4RHeFRpHbCgTcIwLJApEEeZCCMDiDfX6yV8yi4Psw1IQ NoKgsyg5oGKbJVzvH90AVo0jhF/OGq2wiOPOTYg1f6CZ4bDLO0QzNonrWwjpvguKNrOxEA vmDYbMJ9g9twXXDMDGWpfdZBxCl2ZUEh7ShrTQ67+SjAPXcycrA4Uu4I+OxAkDXBcftC0q DIoDn8/NLK74AdoBAGg9zSB4lVbmvEV8y3F2rYm+WSGa/pQdLGBQqJhUX4AxJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhfVn3yMvzjjP; Mon, 27 Jan 2025 20:03: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 50RK3TXR097871; Mon, 27 Jan 2025 20:03:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RK3Tc1097868; Mon, 27 Jan 2025 20:03:29 GMT (envelope-from git) Date: Mon, 27 Jan 2025 20:03:29 GMT Message-Id: <202501272003.50RK3Tc1097868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 066ef2aec187 - main - ports/filesystems: Fix fallout List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 066ef2aec187ae93a9df01d25fa8e47d67ff972b Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=066ef2aec187ae93a9df01d25fa8e47d67ff972b commit 066ef2aec187ae93a9df01d25fa8e47d67ff972b Author: Alexander Ziaee AuthorDate: 2025-01-27 19:59:17 +0000 Commit: Alexander Ziaee CommitDate: 2025-01-27 20:03:10 +0000 ports/filesystems: Fix fallout A new filesystems category was created in the ports tree, with 142 filesystem related ports moved to there, some of them renamed. Update all references in the src tree to the new locations. PR: 283881 Fixes: ports:6e2da9672f79f44 (filesystems: add new category) MFC after: 1 month Reviewed by: fuz, mhorne, bapt Accepted by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D48406 --- release/powerpc/generate-hfs.sh | 2 +- share/man/man4/ccd.4 | 2 +- share/man/man4/smbfs.4 | 2 +- stand/powerpc/boot1.chrp/generate-hfs.sh | 2 +- tools/test/stress2/misc/ext2fs.sh | 2 +- tools/test/stress2/misc/ext2fs2.sh | 2 +- tools/test/stress2/misc/ext2fs3.sh | 2 +- tools/test/stress2/misc/ext3fs.sh | 2 +- tools/test/stress2/misc/ext4fs.sh | 2 +- usr.sbin/autofs/autofs/special_media | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/release/powerpc/generate-hfs.sh b/release/powerpc/generate-hfs.sh index 50f77933f273..e88db0ad771e 100755 --- a/release/powerpc/generate-hfs.sh +++ b/release/powerpc/generate-hfs.sh @@ -1,7 +1,7 @@ #!/bin/sh # This script generates the dummy HFS filesystem used for the PowerPC boot -# blocks. It uses hfsutils (emulators/hfsutils) to generate a template +# blocks. It uses hfsutils (filesystems/hfsutils) to generate a template # filesystem with the relevant interesting files. These are then found by # grep, and the offsets written to a Makefile snippet. # diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4 index 9727fb68064f..0c2bc99682a0 100644 --- a/share/man/man4/ccd.4 +++ b/share/man/man4/ccd.4 @@ -228,7 +228,7 @@ without mounting does not write anything to the .Tn Linux RAID. Then you do a -.Nm fsck.ext2fs Pq Pa ports/sysutils/e2fsprogs +.Nm fsck.ext2fs Pq Pa ports/filesystems/e2fsprogs on the .Nm device using the diff --git a/share/man/man4/smbfs.4 b/share/man/man4/smbfs.4 index f60a9618bc3f..df64bdc3884f 100644 --- a/share/man/man4/smbfs.4 +++ b/share/man/man4/smbfs.4 @@ -62,7 +62,7 @@ and may be removed from a future version of .Fx . Users are advised to evaluate the -.Pa sysutils/fusefs-smbnetfs +.Pa filesystems/smbnetfs port instead. .Ef .Sh SEE ALSO diff --git a/stand/powerpc/boot1.chrp/generate-hfs.sh b/stand/powerpc/boot1.chrp/generate-hfs.sh index c83306ed885d..dc2b12d8f826 100755 --- a/stand/powerpc/boot1.chrp/generate-hfs.sh +++ b/stand/powerpc/boot1.chrp/generate-hfs.sh @@ -1,7 +1,7 @@ #!/bin/sh # This script generates the dummy HFS filesystem used for the PowerPC boot -# blocks. It uses hfsutils (emulators/hfsutils) to generate a template +# blocks. It uses hfsutils (filesystems/hfsutils) to generate a template # filesystem with the relevant interesting files. These are then found by # grep, and the offsets written to a Makefile snippet. # diff --git a/tools/test/stress2/misc/ext2fs.sh b/tools/test/stress2/misc/ext2fs.sh index f4d33116faed..e93da12419b0 100755 --- a/tools/test/stress2/misc/ext2fs.sh +++ b/tools/test/stress2/misc/ext2fs.sh @@ -32,7 +32,7 @@ . ../default.cfg -# Uses mke2fs from sysutils/e2fsprogs +# Uses mke2fs from filesystems/e2fsprogs [ -z "`type mke2fs 2>/dev/null`" ] && echo "Skipping test as mke2fs not installed" && exit 0 diff --git a/tools/test/stress2/misc/ext2fs2.sh b/tools/test/stress2/misc/ext2fs2.sh index 748e45a33ffa..07ff5d5058fb 100755 --- a/tools/test/stress2/misc/ext2fs2.sh +++ b/tools/test/stress2/misc/ext2fs2.sh @@ -33,7 +33,7 @@ . ../default.cfg -# Uses mke2fs from sysutils/e2fsprogs +# Uses mke2fs from filesystems/e2fsprogs [ -x /usr/local/sbin/mke2fs ] || exit 0 mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart diff --git a/tools/test/stress2/misc/ext2fs3.sh b/tools/test/stress2/misc/ext2fs3.sh index fd129a235102..5c904d218a5f 100755 --- a/tools/test/stress2/misc/ext2fs3.sh +++ b/tools/test/stress2/misc/ext2fs3.sh @@ -35,7 +35,7 @@ . ../default.cfg -# Uses mke2fs from sysutils/e2fsprogs +# Uses mke2fs from filesystems/e2fsprogs [ -z "`type mke2fs 2>/dev/null`" ] && echo "Skipping test as mke2fs not installed" && exit 0 diff --git a/tools/test/stress2/misc/ext3fs.sh b/tools/test/stress2/misc/ext3fs.sh index e5a0d9a09481..210008ce3942 100755 --- a/tools/test/stress2/misc/ext3fs.sh +++ b/tools/test/stress2/misc/ext3fs.sh @@ -33,7 +33,7 @@ . ../default.cfg -# Uses mke2fs from sysutils/e2fsprogs +# Uses mke2fs from filesystems/e2fsprogs [ -z "`type mke2fs 2>/dev/null`" ] && echo "Skipping test as mke2fs not installed" && exit 0 diff --git a/tools/test/stress2/misc/ext4fs.sh b/tools/test/stress2/misc/ext4fs.sh index ac5656ed7be0..2e2ac8d77440 100755 --- a/tools/test/stress2/misc/ext4fs.sh +++ b/tools/test/stress2/misc/ext4fs.sh @@ -36,7 +36,7 @@ . ../default.cfg -# Uses mke2fs from sysutils/e2fsprogs +# Uses mke2fs from filesystems/e2fsprogs [ -z "`type mke2fs 2>/dev/null`" ] && echo "Skipping test as mke2fs not installed" && exit 0 diff --git a/usr.sbin/autofs/autofs/special_media b/usr.sbin/autofs/autofs/special_media index b397a8889623..917abae05595 100755 --- a/usr.sbin/autofs/autofs/special_media +++ b/usr.sbin/autofs/autofs/special_media @@ -43,7 +43,7 @@ print_map_entry() { echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype},sync :/dev/${_p}" else /usr/bin/logger -p info -t "special_media[$$]" \ - "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-exfat first" + "Cannot mount ${_fstype} formatted device /dev/${_p}: Install filesystems/exfat first" exit 1 fi ;; @@ -52,7 +52,7 @@ print_map_entry() { echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},sync :/dev/${_p}" else /usr/bin/logger -p info -t "special_media[$$]" \ - "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-ntfs first" + "Cannot mount ${_fstype} formatted device /dev/${_p}: Install filesystems/ntfs first" exit 1 fi ;; From nobody Mon Jan 27 20:06:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhfZp6fVVz5mBtB; Mon, 27 Jan 2025 20:06: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 4YhfZp65xwz3Gw3; Mon, 27 Jan 2025 20:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738008418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PSrl8qAOwAsHRegr/fqSjfHco4FmIsIgMeuGD7MiXSQ=; b=GgjwHTtAqx3gE64UIFeJ8b5EUs/wdestzmqjLy/dHYlfctlmC2+fWK+1kRFr0s48kE0sjF ctbASjHMc/EKCptKmZfLoWS2M7ilZ5qXdWxBT0GOBtMj0EgUOvchNHYAoF1nxFsP5EmkZg PUAFslqpFEmlnRcIBpSElAIp9DwOc9g4GogBVezid2yGlARF6SH/34QJOBnqxMWNXOu+cp 5Sd65oNAsL6R18NwxJ8D3O210dRRGcSk8ekreLfzXHpRwy1wWjqomHhEli7yrfQYht7DOS ghJXrJT4/jligmz5gopPtOVngsvZjcA9FU7/lPNo9uxjiaz5cLpcIzYlhwjQRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738008418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PSrl8qAOwAsHRegr/fqSjfHco4FmIsIgMeuGD7MiXSQ=; b=Ju5XAkkHR3lAv2s8KPWDyNSAfggmeZ2O2yhEJB7zXDjoGmkVJIaV8Abo4l2JevVjtOHXTQ ryMdTfi2lJvCHgB5de/3UWjx3uyjuboUUEWqqebdQwBSMDpsXjff/HKgMj0uvpiCy7ynz3 dOidhBN4bbMFl/xDoweBKdCFIasTnv98hQ+VZkxAcn4U/9gR2zsAeTi5DIoiaVEYavoLKl WtVsoTOtN7zuWgWEtPrcWKhrQtD5CU4RkZcL9dYUvi9T6Pox4jTDXYAP+nSjBM1N9bX0Jc 4YX6rWOXoQ+KWa1ON7X+tcP34PVOKEJ1xP7cMyvgWYaZqZYZ+M/NYAwIfOSfLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738008418; a=rsa-sha256; cv=none; b=RqocrI6yghdzM0SE5BaiLl4to3Av7Yjj2Nl0ZqV7BVBCQCTOEj+FVifhqp/+nXDhKSDVb1 obkRCZGoULRbC/eUejTuPa92AXfzl+K5nIWgQwwzPYHXf1EuqGN7hPF2/3Eh8uOZCLubb+ WGdJKRK8eDVTNKwFADJO9ED2FCcNkAXDtLbWYKHjBlQl1UFsYRps1o1wQMWpSmsZC4aIFw C51z5tZ2xvS1UFjLcKkz3uZMEm8H3I65e/sleNsEBCf3jLLPbAmNmUp0rhzU9xf9DHeFsz rQIU9rmQMc2n4PRBrAHEuGnOqyK3HIt5QO6sNHOwa7tu8FcAaLrff1o+ZDeufA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhfZp54z5zkMf; Mon, 27 Jan 2025 20:06: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 50RK6wtL099025; Mon, 27 Jan 2025 20:06:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RK6w29099022; Mon, 27 Jan 2025 20:06:58 GMT (envelope-from git) Date: Mon, 27 Jan 2025 20:06:58 GMT Message-Id: <202501272006.50RK6w29099022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 449e6a9527f6 - main - a10_timer: some tidying/re-organization List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 449e6a9527f6652888a7027cba57330f191e2610 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=449e6a9527f6652888a7027cba57330f191e2610 commit 449e6a9527f6652888a7027cba57330f191e2610 Author: Mitchell Horne AuthorDate: 2025-01-27 19:59:27 +0000 Commit: Mitchell Horne CommitDate: 2025-01-27 20:03:49 +0000 a10_timer: some tidying/re-organization In preparation for enabling the driver on the D1 platform (riscv). - Better isolate armv7-only portions of the driver - Move a10 timecounter setup into a helper function - Small style tweaks Reviewed by: manu, ganbold MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48670 --- sys/arm/allwinner/a10_timer.c | 90 ++++++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 39 deletions(-) diff --git a/sys/arm/allwinner/a10_timer.c b/sys/arm/allwinner/a10_timer.c index 18fb2a56da3a..80315914949b 100644 --- a/sys/arm/allwinner/a10_timer.c +++ b/sys/arm/allwinner/a10_timer.c @@ -28,12 +28,13 @@ #include #include #include -#include #include +#include #include #include #include #include + #include #include #include @@ -79,8 +80,8 @@ /* 64 bit counter, available in A10 and A13 */ #define CNT64_CTRL_REG 0xa0 #define CNT64_CTRL_RL_EN 0x02 /* read latch enable */ -#define CNT64_LO_REG 0xa4 -#define CNT64_HI_REG 0xa8 +#define CNT64_LO_REG 0xa4 +#define CNT64_HI_REG 0xa8 #define SYS_TIMER_CLKSRC 24000000 /* clock source */ @@ -104,18 +105,17 @@ struct a10_timer_softc { #define timer_write_4(sc, reg, val) \ bus_write_4(sc->res[A10_TIMER_MEMRES], reg, val) -static u_int a10_timer_get_timecount(struct timecounter *); #if defined(__arm__) +static u_int a10_timer_get_timecount(struct timecounter *); +static uint64_t a10_timer_read_counter64(struct a10_timer_softc *sc); +static void a10_timer_timecounter_setup(struct a10_timer_softc *sc); + +static void a10_timer_eventtimer_setup(struct a10_timer_softc *sc); static int a10_timer_timer_start(struct eventtimer *, sbintime_t first, sbintime_t period); static int a10_timer_timer_stop(struct eventtimer *); #endif -static uint64_t timer_read_counter64(struct a10_timer_softc *sc); -#if defined(__arm__) -static void a10_timer_eventtimer_setup(struct a10_timer_softc *sc); -#endif - #if defined(__aarch64__) static void a23_timer_timecounter_setup(struct a10_timer_softc *sc); static u_int a23_timer_get_timecount(struct timecounter *tc); @@ -127,7 +127,6 @@ static int a10_timer_attach(device_t); #if defined(__arm__) static delay_func a10_timer_delay; -#endif static struct timecounter a10_timer_timecounter = { .tc_name = "a10_timer timer0", @@ -136,6 +135,7 @@ static struct timecounter a10_timer_timecounter = { .tc_frequency = 0, .tc_quality = 1000, }; +#endif #if defined(__aarch64__) static struct timecounter a23_timer_timecounter = { @@ -168,16 +168,12 @@ static struct ofw_compat_data compat_data[] = { static int a10_timer_probe(device_t dev) { -#if defined(__arm__) - u_int soc_family; -#endif - if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) return (ENXIO); #if defined(__arm__) /* For SoC >= A10 we have the ARM Timecounter/Eventtimer */ - soc_family = allwinner_soc_family(); + u_int soc_family = allwinner_soc_family(); if (soc_family != ALLWINNERSOC_SUN4I && soc_family != ALLWINNERSOC_SUN5I) return (ENXIO); @@ -214,34 +210,27 @@ a10_timer_attach(device_t dev) return (ENXIO); } - if (clk_get_by_ofw_index(dev, 0, 0, &clk) != 0) + if (clk_get_by_ofw_index(dev, 0, 0, &clk) != 0) { sc->timer0_freq = SYS_TIMER_CLKSRC; - else { + } else { if (clk_get_freq(clk, &sc->timer0_freq) != 0) { device_printf(dev, "Cannot get clock source frequency\n"); return (ENXIO); } } + if (bootverbose) { + device_printf(sc->sc_dev, "clock: hz=%d stathz = %d\n", hz, + stathz); + } + #if defined(__arm__) a10_timer_eventtimer_setup(sc); - arm_set_delay(a10_timer_delay, sc); - a10_timer_timecounter.tc_priv = sc; - a10_timer_timecounter.tc_frequency = sc->timer0_freq; - tc_init(&a10_timer_timecounter); + a10_timer_timecounter_setup(sc); #elif defined(__aarch64__) a23_timer_timecounter_setup(sc); #endif - if (bootverbose) { - device_printf(sc->sc_dev, "clock: hz=%d stathz = %d\n", hz, stathz); - - device_printf(sc->sc_dev, "event timer clock frequency %ju\n", - sc->timer0_freq); - device_printf(sc->sc_dev, "timecounter clock frequency %jd\n", - a10_timer_timecounter.tc_frequency); - } - return (0); } @@ -311,6 +300,11 @@ a10_timer_eventtimer_setup(struct a10_timer_softc *sc) sc->et.et_stop = a10_timer_timer_stop; sc->et.et_priv = sc; et_register(&sc->et); + + if (bootverbose) { + device_printf(sc->sc_dev, "event timer clock frequency %ju\n", + sc->timer0_freq); + } } static int @@ -368,7 +362,7 @@ a10_timer_timer_stop(struct eventtimer *et) return (0); } -#endif +#endif /* __arm__ */ /* * Timecounter functions for A23 and above @@ -400,6 +394,11 @@ a23_timer_timecounter_setup(struct a10_timer_softc *sc) a23_timer_timecounter.tc_priv = sc; a23_timer_timecounter.tc_frequency = sc->timer0_freq; tc_init(&a23_timer_timecounter); + + if (bootverbose) { + device_printf(sc->sc_dev, "timecounter clock frequency %jd\n", + a23_timer_timecounter.tc_frequency); + } } static u_int @@ -416,14 +415,15 @@ a23_timer_get_timecount(struct timecounter *tc) /* Counter count backwards */ return (~0u - val); } -#endif +#endif /* __aarch64__ */ /* * Timecounter functions for A10 and A13, using the 64 bits counter */ +#if defined(__arm__) static uint64_t -timer_read_counter64(struct a10_timer_softc *sc) +a10_timer_read_counter64(struct a10_timer_softc *sc) { uint32_t lo, hi; @@ -438,30 +438,42 @@ timer_read_counter64(struct a10_timer_softc *sc) return (((uint64_t)hi << 32) | lo); } -#if defined(__arm__) static void a10_timer_delay(int usec, void *arg) { struct a10_timer_softc *sc = arg; uint64_t end, now; - now = timer_read_counter64(sc); + now = a10_timer_read_counter64(sc); end = now + (sc->timer0_freq / 1000000) * (usec + 1); while (now < end) - now = timer_read_counter64(sc); + now = a10_timer_read_counter64(sc); } -#endif static u_int a10_timer_get_timecount(struct timecounter *tc) { - if (tc->tc_priv == NULL) return (0); - return ((u_int)timer_read_counter64(tc->tc_priv)); + return ((u_int)a10_timer_read_counter64(tc->tc_priv)); +} + +static void +a10_timer_timecounter_setup(struct a10_timer_softc *sc) +{ + arm_set_delay(a10_timer_delay, sc); + a10_timer_timecounter.tc_priv = sc; + a10_timer_timecounter.tc_frequency = sc->timer0_freq; + tc_init(&a10_timer_timecounter); + + if (bootverbose) { + device_printf(sc->sc_dev, "timecounter clock frequency %jd\n", + a10_timer_timecounter.tc_frequency); + } } +#endif /* __arm__ */ static device_method_t a10_timer_methods[] = { DEVMETHOD(device_probe, a10_timer_probe), From nobody Mon Jan 27 20:06:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhfZr2wqsz5mCB8; Mon, 27 Jan 2025 20:07: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 4YhfZq6nJcz3HFS; Mon, 27 Jan 2025 20:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738008420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+pAG8/OfExdPz7DmQTulY5FOmJkaI3ZH8Wl+wVsa8Co=; b=ir7S2NNDweCY3CT9GYquWsJxwFRSMs+AwTGjgmcHfmy5hnz+fyKz8A+6zClBWJNYwz6Iwc gib/wpZYQ3q6QIneTypxiWGWMza7OjvXQ77G1963N7gC/rKUc52GudcDLGopz1hI+d92dL I238VoolF/eZ49knbW5kTTvASalAkRKPgOIjDG8jYcqdfMfDzKk1ihhD29ungnA7DUIDvc YiujHh3CpdCsilUvI0WKF8PoNcknHh8MLX0D8tn7IaOeEZ7bHNVQRA6LxSLWtO44LW05JP 5O7pnrqyVOgfnIJbZFGyi1L+t7lThHaK3DPogjLndiXm8SOsKoeHXimvh69kWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738008420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+pAG8/OfExdPz7DmQTulY5FOmJkaI3ZH8Wl+wVsa8Co=; b=f3nG0mfnH+l+97kixjKumb5xgQORTW8Zx3cQJN9YQrEyhWtRAdLbf2xF0lClNjZCyWe/WA xEvNWmO3kuNKzATfrgUV5SiiiKC+v0WazgfvB1tLBtJJwhPLPy09LgM2DtJ8P569a2qESI tSk+M+bQ+Lik9nOhs/jh2pDANT9oWUulhZvI4FkGFqQs+AkrN+bErjscrRsvvyFf8GBwmw qmiR8AtZsMElaZDwZtJxwLlCmIP1BDKsb1fdBU95CNOCqLoc0Kf6M9ZBxBfFDf5VoN6oGM xbVucFBV3NHWEnyP+BcXwnXNE69XjGtq4uRw/EvGSjLgltje6DbyrC2qkR7Vfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738008420; a=rsa-sha256; cv=none; b=XO+x1RhAawbMosZmctO6eMhQUF2MN4iqm24L+yYei8kjK8YnMof2IJY89Unf295QYwjWXa flxXUT9KC5DFURQ2emZu9BEypfYFfzpNJfbjZ9ldUaiIcYkNLU4ZpQXSIFIzdwZHEROAKU QeiA5OBTnC6z01z6fPMK3sivLR7CNvwYtxD9UFoLg5wM2wnvjs0h0+tUsxiTwlVm1O9ugq BzSUN6Fa0mL3V8eD0PTKlUnx6Qkjgn4RFdmTJnE3QvzLpbXZYrDvQlUsaO5Lyr3jHubPOL dbp9hPACSQmkNDWGJrp+/aTWDNj/4rFn0n7GCOA9+Umo9e32Xb7wFRkFhzGt8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhfZq6HK3zjvF; Mon, 27 Jan 2025 20:06: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 50RK6xn8099064; Mon, 27 Jan 2025 20:06:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RK6xjF099061; Mon, 27 Jan 2025 20:06:59 GMT (envelope-from git) Date: Mon, 27 Jan 2025 20:06:59 GMT Message-Id: <202501272006.50RK6xjF099061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: c4530dfff495 - main - aw_timer: rename driver from a10_timer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4530dfff495c588cc9ba4faaf0fa8fddfd57441 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c4530dfff495c588cc9ba4faaf0fa8fddfd57441 commit c4530dfff495c588cc9ba4faaf0fa8fddfd57441 Author: Mitchell Horne AuthorDate: 2025-01-27 19:59:51 +0000 Commit: Mitchell Horne CommitDate: 2025-01-27 20:04:09 +0000 aw_timer: rename driver from a10_timer This reflects its expanded support for platforms other than the A10. Functions specific to A10/A13 retain the a10 prefix, but the majority of names in the driver are changed, e.g. a10_timer_softc becomes aw_timer_softc. Reviewed by: manu, ganbold MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48671 --- UPDATING | 6 ++ sys/arm/allwinner/{a10_timer.c => aw_timer.c} | 110 +++++++++++++------------- sys/arm/allwinner/files.allwinner_up | 2 +- sys/arm64/conf/NOTES | 2 +- sys/arm64/conf/std.allwinner | 2 +- sys/conf/files.arm64 | 2 +- 6 files changed, 65 insertions(+), 59 deletions(-) diff --git a/UPDATING b/UPDATING index 7329837c48ee..dfc73f7d4db5 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20250127: + The Allwinner a10_timer driver has been renamed to aw_driver. If you + have a custom kernel configuration including the line 'device + a10_timer', it must be adjusted to 'device aw_timer'. The same applies + for device exclusions with 'nodevice'. + 20250106: A new SOC_ROCKCHIP options appeared, so if you have a custom kernel configuration targetting Rockchip SoC you need to add it so shared and mandatory drivers for diff --git a/sys/arm/allwinner/a10_timer.c b/sys/arm/allwinner/aw_timer.c similarity index 81% rename from sys/arm/allwinner/a10_timer.c rename to sys/arm/allwinner/aw_timer.c index 80315914949b..a7317e299871 100644 --- a/sys/arm/allwinner/a10_timer.c +++ b/sys/arm/allwinner/aw_timer.c @@ -85,51 +85,51 @@ #define SYS_TIMER_CLKSRC 24000000 /* clock source */ -enum a10_timer_type { +enum aw_timer_type { A10_TIMER = 1, A23_TIMER, }; -struct a10_timer_softc { +struct aw_timer_softc { device_t sc_dev; struct resource *res[2]; void *sc_ih; /* interrupt handler */ uint32_t sc_period; uint64_t timer0_freq; struct eventtimer et; - enum a10_timer_type type; + enum aw_timer_type type; }; #define timer_read_4(sc, reg) \ - bus_read_4(sc->res[A10_TIMER_MEMRES], reg) + bus_read_4(sc->res[AW_TIMER_MEMRES], reg) #define timer_write_4(sc, reg, val) \ - bus_write_4(sc->res[A10_TIMER_MEMRES], reg, val) + bus_write_4(sc->res[AW_TIMER_MEMRES], reg, val) #if defined(__arm__) static u_int a10_timer_get_timecount(struct timecounter *); -static uint64_t a10_timer_read_counter64(struct a10_timer_softc *sc); -static void a10_timer_timecounter_setup(struct a10_timer_softc *sc); +static uint64_t a10_timer_read_counter64(struct aw_timer_softc *sc); +static void a10_timer_timecounter_setup(struct aw_timer_softc *sc); -static void a10_timer_eventtimer_setup(struct a10_timer_softc *sc); -static int a10_timer_timer_start(struct eventtimer *, - sbintime_t first, sbintime_t period); -static int a10_timer_timer_stop(struct eventtimer *); +static void aw_timer_eventtimer_setup(struct aw_timer_softc *sc); +static int aw_timer_eventtimer_start(struct eventtimer *, sbintime_t first, + sbintime_t period); +static int aw_timer_eventtimer_stop(struct eventtimer *); #endif #if defined(__aarch64__) -static void a23_timer_timecounter_setup(struct a10_timer_softc *sc); +static void a23_timer_timecounter_setup(struct aw_timer_softc *sc); static u_int a23_timer_get_timecount(struct timecounter *tc); #endif -static int a10_timer_irq(void *); -static int a10_timer_probe(device_t); -static int a10_timer_attach(device_t); +static int aw_timer_irq(void *); +static int aw_timer_probe(device_t); +static int aw_timer_attach(device_t); #if defined(__arm__) static delay_func a10_timer_delay; static struct timecounter a10_timer_timecounter = { - .tc_name = "a10_timer timer0", + .tc_name = "aw_timer timer0", .tc_get_timecount = a10_timer_get_timecount, .tc_counter_mask = ~0u, .tc_frequency = 0, @@ -139,7 +139,7 @@ static struct timecounter a10_timer_timecounter = { #if defined(__aarch64__) static struct timecounter a23_timer_timecounter = { - .tc_name = "a10_timer timer0", + .tc_name = "aw_timer timer0", .tc_get_timecount = a23_timer_get_timecount, .tc_counter_mask = ~0u, .tc_frequency = 0, @@ -148,10 +148,10 @@ static struct timecounter a23_timer_timecounter = { }; #endif -#define A10_TIMER_MEMRES 0 -#define A10_TIMER_IRQRES 1 +#define AW_TIMER_MEMRES 0 +#define AW_TIMER_IRQRES 1 -static struct resource_spec a10_timer_spec[] = { +static struct resource_spec aw_timer_spec[] = { { SYS_RES_MEMORY, 0, RF_ACTIVE }, { SYS_RES_IRQ, 0, RF_ACTIVE }, { -1, 0 } @@ -166,7 +166,7 @@ static struct ofw_compat_data compat_data[] = { }; static int -a10_timer_probe(device_t dev) +aw_timer_probe(device_t dev) { if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) return (ENXIO); @@ -184,16 +184,16 @@ a10_timer_probe(device_t dev) } static int -a10_timer_attach(device_t dev) +aw_timer_attach(device_t dev) { - struct a10_timer_softc *sc; + struct aw_timer_softc *sc; clk_t clk; int err; sc = device_get_softc(dev); sc->type = ofw_bus_search_compatible(dev, compat_data)->ocd_data; - if (bus_alloc_resources(dev, a10_timer_spec, sc->res)) { + if (bus_alloc_resources(dev, aw_timer_spec, sc->res)) { device_printf(dev, "could not allocate resources\n"); return (ENXIO); } @@ -201,10 +201,10 @@ a10_timer_attach(device_t dev) sc->sc_dev = dev; /* Setup and enable the timer interrupt */ - err = bus_setup_intr(dev, sc->res[A10_TIMER_IRQRES], INTR_TYPE_CLK, - a10_timer_irq, NULL, sc, &sc->sc_ih); + err = bus_setup_intr(dev, sc->res[AW_TIMER_IRQRES], INTR_TYPE_CLK, + aw_timer_irq, NULL, sc, &sc->sc_ih); if (err != 0) { - bus_release_resources(dev, a10_timer_spec, sc->res); + bus_release_resources(dev, aw_timer_spec, sc->res); device_printf(dev, "Unable to setup the clock irq handler, " "err = %d\n", err); return (ENXIO); @@ -225,7 +225,7 @@ a10_timer_attach(device_t dev) } #if defined(__arm__) - a10_timer_eventtimer_setup(sc); + aw_timer_eventtimer_setup(sc); a10_timer_timecounter_setup(sc); #elif defined(__aarch64__) a23_timer_timecounter_setup(sc); @@ -235,12 +235,12 @@ a10_timer_attach(device_t dev) } static int -a10_timer_irq(void *arg) +aw_timer_irq(void *arg) { - struct a10_timer_softc *sc; + struct aw_timer_softc *sc; uint32_t val; - sc = (struct a10_timer_softc *)arg; + sc = (struct aw_timer_softc *)arg; /* Clear interrupt pending bit. */ timer_write_4(sc, TIMER_IRQ_STA_REG, TIMER_IRQ_PENDING(0)); @@ -274,7 +274,7 @@ a10_timer_irq(void *arg) #if defined(__arm__) static void -a10_timer_eventtimer_setup(struct a10_timer_softc *sc) +aw_timer_eventtimer_setup(struct aw_timer_softc *sc) { uint32_t val; @@ -291,13 +291,13 @@ a10_timer_eventtimer_setup(struct a10_timer_softc *sc) /* Set desired frequency in event timer and timecounter */ sc->et.et_frequency = sc->timer0_freq; - sc->et.et_name = "a10_timer Eventtimer"; + sc->et.et_name = "aw_timer Eventtimer"; sc->et.et_flags = ET_FLAGS_ONESHOT | ET_FLAGS_PERIODIC; sc->et.et_quality = 1000; sc->et.et_min_period = (0x00000005LLU << 32) / sc->et.et_frequency; sc->et.et_max_period = (0xfffffffeLLU << 32) / sc->et.et_frequency; - sc->et.et_start = a10_timer_timer_start; - sc->et.et_stop = a10_timer_timer_stop; + sc->et.et_start = aw_timer_eventtimer_start; + sc->et.et_stop = aw_timer_eventtimer_stop; sc->et.et_priv = sc; et_register(&sc->et); @@ -308,14 +308,14 @@ a10_timer_eventtimer_setup(struct a10_timer_softc *sc) } static int -a10_timer_timer_start(struct eventtimer *et, sbintime_t first, +aw_timer_eventtimer_start(struct eventtimer *et, sbintime_t first, sbintime_t period) { - struct a10_timer_softc *sc; + struct aw_timer_softc *sc; uint32_t count; uint32_t val; - sc = (struct a10_timer_softc *)et->et_priv; + sc = (struct aw_timer_softc *)et->et_priv; if (period != 0) sc->sc_period = ((uint32_t)et->et_frequency * period) >> 32; @@ -346,12 +346,12 @@ a10_timer_timer_start(struct eventtimer *et, sbintime_t first, } static int -a10_timer_timer_stop(struct eventtimer *et) +aw_timer_eventtimer_stop(struct eventtimer *et) { - struct a10_timer_softc *sc; + struct aw_timer_softc *sc; uint32_t val; - sc = (struct a10_timer_softc *)et->et_priv; + sc = (struct aw_timer_softc *)et->et_priv; /* Disable timer0 */ val = timer_read_4(sc, TIMER_CTRL_REG(0)); @@ -370,7 +370,7 @@ a10_timer_timer_stop(struct eventtimer *et) #if defined(__aarch64__) static void -a23_timer_timecounter_setup(struct a10_timer_softc *sc) +a23_timer_timecounter_setup(struct aw_timer_softc *sc) { uint32_t val; @@ -404,10 +404,10 @@ a23_timer_timecounter_setup(struct a10_timer_softc *sc) static u_int a23_timer_get_timecount(struct timecounter *tc) { - struct a10_timer_softc *sc; + struct aw_timer_softc *sc; uint32_t val; - sc = (struct a10_timer_softc *)tc->tc_priv; + sc = (struct aw_timer_softc *)tc->tc_priv; if (sc == NULL) return (0); @@ -423,7 +423,7 @@ a23_timer_get_timecount(struct timecounter *tc) #if defined(__arm__) static uint64_t -a10_timer_read_counter64(struct a10_timer_softc *sc) +a10_timer_read_counter64(struct aw_timer_softc *sc) { uint32_t lo, hi; @@ -441,7 +441,7 @@ a10_timer_read_counter64(struct a10_timer_softc *sc) static void a10_timer_delay(int usec, void *arg) { - struct a10_timer_softc *sc = arg; + struct aw_timer_softc *sc = arg; uint64_t end, now; now = a10_timer_read_counter64(sc); @@ -461,7 +461,7 @@ a10_timer_get_timecount(struct timecounter *tc) } static void -a10_timer_timecounter_setup(struct a10_timer_softc *sc) +a10_timer_timecounter_setup(struct aw_timer_softc *sc) { arm_set_delay(a10_timer_delay, sc); a10_timer_timecounter.tc_priv = sc; @@ -475,18 +475,18 @@ a10_timer_timecounter_setup(struct a10_timer_softc *sc) } #endif /* __arm__ */ -static device_method_t a10_timer_methods[] = { - DEVMETHOD(device_probe, a10_timer_probe), - DEVMETHOD(device_attach, a10_timer_attach), +static device_method_t aw_timer_methods[] = { + DEVMETHOD(device_probe, aw_timer_probe), + DEVMETHOD(device_attach, aw_timer_attach), DEVMETHOD_END }; -static driver_t a10_timer_driver = { - "a10_timer", - a10_timer_methods, - sizeof(struct a10_timer_softc), +static driver_t aw_timer_driver = { + "aw_timer", + aw_timer_methods, + sizeof(struct aw_timer_softc), }; -EARLY_DRIVER_MODULE(a10_timer, simplebus, a10_timer_driver, 0, 0, +EARLY_DRIVER_MODULE(aw_timer, simplebus, aw_timer_driver, 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/arm/allwinner/files.allwinner_up b/sys/arm/allwinner/files.allwinner_up index 3fcc600ad6cc..9944b5893dd5 100644 --- a/sys/arm/allwinner/files.allwinner_up +++ b/sys/arm/allwinner/files.allwinner_up @@ -1,2 +1,2 @@ -arm/allwinner/a10_timer.c standard +arm/allwinner/aw_timer.c standard diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES index 54bc7dcf1f09..c3e1930836b9 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -50,7 +50,7 @@ options SOC_ROCKCHIP_RK3568 options SOC_XILINX_ZYNQ # Timer drivers -device a10_timer +device aw_timer # Annapurna Alpine drivers device al_ccu # Alpine Cache Coherency Unit diff --git a/sys/arm64/conf/std.allwinner b/sys/arm64/conf/std.allwinner index 2bcbdc32e111..345322cebb0f 100644 --- a/sys/arm64/conf/std.allwinner +++ b/sys/arm64/conf/std.allwinner @@ -8,7 +8,7 @@ options SOC_ALLWINNER_H5 options SOC_ALLWINNER_H6 # Timer drivers -device a10_timer +device aw_timer # DMA controller device a31_dmac diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 64c8acfcdb9a..4b73ebd1e6db 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -478,7 +478,6 @@ dev/vnic/lmac_if.m optional inet | inet6 | vnic ## # Allwinner common files -arm/allwinner/a10_timer.c optional a10_timer fdt arm/allwinner/a10_codec.c optional sound a10_codec fdt arm/allwinner/a31_dmac.c optional a31_dmac fdt arm/allwinner/a33_codec.c optional fdt sound a33_codec @@ -495,6 +494,7 @@ arm/allwinner/aw_rsb.c optional aw_rsb fdt arm/allwinner/aw_rtc.c optional aw_rtc fdt arm/allwinner/aw_sid.c optional aw_sid nvmem fdt arm/allwinner/aw_syscon.c optional aw_syscon syscon fdt +arm/allwinner/aw_timer.c optional aw_timer fdt arm/allwinner/aw_thermal.c optional aw_thermal nvmem fdt arm/allwinner/aw_usbphy.c optional ehci aw_usbphy fdt arm/allwinner/aw_usb3phy.c optional xhci aw_usbphy fdt From nobody Mon Jan 27 20:07:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhfZs2x56z5mCLn; Mon, 27 Jan 2025 20:07: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 4YhfZr705gz3H1W; Mon, 27 Jan 2025 20:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738008421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJnnRwLWpj8aU3tAN0b0GUECVPJcfIu3t0OkpyYFtIk=; b=gMN2QwECoy20zrC3SFwM3/0ZanZkny2aVEX1NdGOzxavCJr05TpsY7m/YIIGpIgHgmQha2 V4ZUuwyMBScOrxnWE0srJ73jHz/9O8RsQkQGNx/09OF7fMjbrQupOVVCBmKI00GO3Kion9 zZM1y4oF/5HwcvmMyD5EjZ8KUpfvNhH41aOjFjLwFvppokRWR+O+BoEjG3zXBheOj8YY99 ogtN9nD9UPRWHuYIcq/x0qfohUeH5ZKnNr1acjUrJxqkhFm1OsClos9uf4XLnBlvRBK6dD MqsYnznl60NHUmzfUdh73vHFjo6+rpjjYC2iiLBuFVR5VK7BS543XNkyLepDMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738008421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJnnRwLWpj8aU3tAN0b0GUECVPJcfIu3t0OkpyYFtIk=; b=kXF35ANIDdliD3MMV4KugScO7I/Hl7FqfeSLm3juOsDHa4wOl7iPGPpxhibjrqpBc7unnx 2HpI/c3NOqZQIzTRQmiQ9ZCFxGAXqcV1AdakuRQ5fsKTilafGFzEeR+gV+DYx+ea9cSZRg PcboIq2JS+7efALz5CaUtHzpQxU2HIUtloDENb/555kD4B1ku7xER0y5lvLxsRfr6nEB3/ wjep0prC+1xiPpY9uPC6W9BR9HRohiiCo9IEhCRp0n5mYlWPELZGsO1nHAXfnT0IHqhyUl pbET+kD5+WzIguJEgt1ssL11mc1aKj3rYFX8mWnmds9qUehYOzMTvzlNdu4fuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738008421; a=rsa-sha256; cv=none; b=BP9EQcIm5W5hQ4+YKejzEb4+j5PQqGyHBBSXCbxKjcwVIRZQgDNLt3ZJjnNPtNd5lwshuB TeIL4R0r7z61AlLrU5yNol/270PL7KDfc5j/BHZEw+QMe/CfQwNrTYh2nGTQCzeAt26VIg 9rWMQuyJJezIRBfak43DBG7OQuxjnnadLnSJ2UFypnA7s451UAujKv86GgKhXgW/4g+zxh Di8Oo5829sVFNnvTlxpJN5J7PnczQygJj7q0rlYUVpLcS5rnynS6cnBjuUTU9HZS9cZgq8 IROlvd5nZne3dEbxE5pghQbmEDF1GaI4ve2y/MQwdrCnJegv+RLlegmEsRPIWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhfZr6YDMzjH3; Mon, 27 Jan 2025 20:07: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 50RK70NH099104; Mon, 27 Jan 2025 20:07:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RK70gR099101; Mon, 27 Jan 2025 20:07:00 GMT (envelope-from git) Date: Mon, 27 Jan 2025 20:07:00 GMT Message-Id: <202501272007.50RK70gR099101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 9257fe124f0e - main - riscv: aw_timer enablement for D1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9257fe124f0e640ca5cab77754117bd2e55f28d5 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9257fe124f0e640ca5cab77754117bd2e55f28d5 commit 9257fe124f0e640ca5cab77754117bd2e55f28d5 Author: Mitchell Horne AuthorDate: 2025-01-27 20:00:21 +0000 Commit: Mitchell Horne CommitDate: 2025-01-27 20:04:14 +0000 riscv: aw_timer enablement for D1 The SBI timer functionality is partially broken on the Allwinner D1, so we require this driver to provide an eventtimer/system timer interrupts. The timecounter interface, on the other hand, is not required. The generic RISC-V timer driver uses the native rdtime instruction, and implements vdso, so this should be preferred. Reviewed by: manu, ganbold MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48672 --- sys/arm/allwinner/aw_timer.c | 39 +++++++++++++++++++++++++++---------- sys/riscv/allwinner/files.allwinner | 1 + sys/riscv/conf/std.allwinner | 1 + 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/sys/arm/allwinner/aw_timer.c b/sys/arm/allwinner/aw_timer.c index a7317e299871..ae609f96f1d3 100644 --- a/sys/arm/allwinner/aw_timer.c +++ b/sys/arm/allwinner/aw_timer.c @@ -45,7 +45,7 @@ #include -#if defined(__aarch64__) +#if defined(__aarch64__) || defined(__riscv) #include "opt_soc.h" #else #include @@ -88,6 +88,7 @@ enum aw_timer_type { A10_TIMER = 1, A23_TIMER, + D1_TIMER, }; struct aw_timer_softc { @@ -109,7 +110,10 @@ struct aw_timer_softc { static u_int a10_timer_get_timecount(struct timecounter *); static uint64_t a10_timer_read_counter64(struct aw_timer_softc *sc); static void a10_timer_timecounter_setup(struct aw_timer_softc *sc); +#endif +#if defined(__arm__) || defined(__riscv) +#define USE_EVENTTIMER static void aw_timer_eventtimer_setup(struct aw_timer_softc *sc); static int aw_timer_eventtimer_start(struct eventtimer *, sbintime_t first, sbintime_t period); @@ -126,6 +130,8 @@ static int aw_timer_probe(device_t); static int aw_timer_attach(device_t); #if defined(__arm__) +#define AW_TIMER_QUALITY 1000 + static delay_func a10_timer_delay; static struct timecounter a10_timer_timecounter = { @@ -133,21 +139,28 @@ static struct timecounter a10_timer_timecounter = { .tc_get_timecount = a10_timer_get_timecount, .tc_counter_mask = ~0u, .tc_frequency = 0, - .tc_quality = 1000, + .tc_quality = AW_TIMER_QUALITY, }; #endif #if defined(__aarch64__) +/* We want it to be selected over the arm generic timecounter */ +#define AW_TIMER_QUALITY 2000 + static struct timecounter a23_timer_timecounter = { .tc_name = "aw_timer timer0", .tc_get_timecount = a23_timer_get_timecount, .tc_counter_mask = ~0u, .tc_frequency = 0, - /* We want it to be selected over the arm generic timecounter */ - .tc_quality = 2000, + .tc_quality = AW_TIMER_QUALITY, }; #endif +#if defined(__riscv) +/* We want it to be selected over the generic RISC-V eventtimer */ +#define AW_TIMER_QUALITY 2000 +#endif + #define AW_TIMER_MEMRES 0 #define AW_TIMER_IRQRES 1 @@ -161,6 +174,8 @@ static struct ofw_compat_data compat_data[] = { {"allwinner,sun4i-a10-timer", A10_TIMER}, #if defined(__aarch64__) {"allwinner,sun8i-a23-timer", A23_TIMER}, +#elif defined(__riscv) + {"allwinner,sun20i-d1-timer", D1_TIMER}, #endif {NULL, 0}, }; @@ -224,8 +239,13 @@ aw_timer_attach(device_t dev) stathz); } -#if defined(__arm__) + /* Set up eventtimer (if applicable) */ +#if defined(USE_EVENTTIMER) aw_timer_eventtimer_setup(sc); +#endif + + /* Set up timercounter (if applicable) */ +#if defined(__arm__) a10_timer_timecounter_setup(sc); #elif defined(__aarch64__) a23_timer_timecounter_setup(sc); @@ -269,10 +289,9 @@ aw_timer_irq(void *arg) } /* - * Event timer function for A10 and A13 + * Event timer function for A10, A13, and D1. */ - -#if defined(__arm__) +#if defined(USE_EVENTTIMER) static void aw_timer_eventtimer_setup(struct aw_timer_softc *sc) { @@ -293,7 +312,7 @@ aw_timer_eventtimer_setup(struct aw_timer_softc *sc) sc->et.et_frequency = sc->timer0_freq; sc->et.et_name = "aw_timer Eventtimer"; sc->et.et_flags = ET_FLAGS_ONESHOT | ET_FLAGS_PERIODIC; - sc->et.et_quality = 1000; + sc->et.et_quality = AW_TIMER_QUALITY; sc->et.et_min_period = (0x00000005LLU << 32) / sc->et.et_frequency; sc->et.et_max_period = (0xfffffffeLLU << 32) / sc->et.et_frequency; sc->et.et_start = aw_timer_eventtimer_start; @@ -362,7 +381,7 @@ aw_timer_eventtimer_stop(struct eventtimer *et) return (0); } -#endif /* __arm__ */ +#endif /* USE_EVENTTIMER */ /* * Timecounter functions for A23 and above diff --git a/sys/riscv/allwinner/files.allwinner b/sys/riscv/allwinner/files.allwinner index a87d79dfda2a..73fa9660e2d2 100644 --- a/sys/riscv/allwinner/files.allwinner +++ b/sys/riscv/allwinner/files.allwinner @@ -3,6 +3,7 @@ arm/allwinner/aw_gpio.c optional gpio aw_gpio fdt arm/allwinner/aw_rtc.c optional aw_rtc fdt arm/allwinner/aw_syscon.c optional syscon arm/allwinner/aw_sid.c optional aw_sid nvmem +arm/allwinner/aw_timer.c optional aw_timer fdt arm/allwinner/aw_usbphy.c optional ehci aw_usbphy fdt arm/allwinner/aw_wdog.c optional aw_wdog arm/allwinner/if_awg.c optional awg syscon diff --git a/sys/riscv/conf/std.allwinner b/sys/riscv/conf/std.allwinner index 5e7a6c0e0a52..2b1e0d4e09dc 100644 --- a/sys/riscv/conf/std.allwinner +++ b/sys/riscv/conf/std.allwinner @@ -9,6 +9,7 @@ device aw_ccu # Allwinner clock controller device aw_gpio # Allwinner GPIO controller device aw_rtc # Allwinner Real-time Clock device aw_sid # Allwinner Secure ID EFUSE +device aw_timer # Allwinner Timer device aw_usbphy # Allwinner USB PHY device aw_wdog # Allwinner Watchdog device awg # Allwinner EMAC Gigabit Ethernet From nobody Tue Jan 28 01:41:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yhp0W6db2z5lh0G; Tue, 28 Jan 2025 01:41: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 4Yhp0W6QTvz3vvx; Tue, 28 Jan 2025 01:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738028475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FIGOtEE2uBw8MXStJklcaHJHPQISBykEVpAoeu7HL9c=; b=fNb9UnaVnxl/uFRUijxGzofOLAvDYnUW6ns9g3lG9H0PdeQEFvj/qjaHqLDii1vgv196LI TyL1YMAbwf/+52h3YYwdVoc8eM2tvM8seJl0FjNVaUomK/c1NVkPB13b7cA0KGT64MXh2y DQz7+IqmCgQGBhT3ZmsacDRAU2w15WjtyuVjarl9nn6+T62t3tg2542MLhjt3GfBPRNpWH LYK+VoPMRAeZqxAW3cqmR9uCt02w15kBcoP0lifnP9VyVvDncbpQLl/NMRnNNRww3Jnw9I 9NW0wwEFr4BRSrT/kfddGTEehwKGLgW57lmj+BJEJkuWlDSLal8aGr5A4KZl9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738028475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FIGOtEE2uBw8MXStJklcaHJHPQISBykEVpAoeu7HL9c=; b=rtkpGdOUws/xosHTsMr5RmMab8sZ9xXH/7RcIo54thoKxvwsVut9B1aTCE2Ca6fcIqWu5a 7j7oLkA7oXgUPgcoZtd+mcQZaSx+AuQ8JNx/YSxSsPXTAQa0kyND7C8OWHdFt0e5ryVbgs sEYq+a2P8rjOsSnaRkOjjFtr/hawbab/3NGtYqsqm4p4/xn5YUu2grgl4E0dtqZymKPdBK Ju3vUy1QG8uJPQCR4moD9nKyHu8rVo8riBBWH4l9cDkCcRhcSAXDK4E32yD7W4bF2jPGJv 3Tnw2u5Y0mYQbE1XiZ7p0rSiPqoFp/jgRTr7FN0EsYn2OZIKovC0Ay66510WOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738028475; a=rsa-sha256; cv=none; b=r2jbF7YReF57IZR44gHnIIRwbatuuahfwfR8zrVzhK+E6wn5QvV4g2HZeJSWQpsjawwxiU HUK/zhmRcIk+aLK3qhkJq8YKvXWO0HF9GwLgfxpBW+qtrlEjNHol4bYwL2UAIdsjpsNZrb ZPRJ8NO3Mb0fKeLUYvF59ecOhTcY2cHT8Oo/C9pEuQcG5X5WVlRM+1ge62692ZCLyJpmPQ EgAOMnEbPlhSaMfwfdAoryaIC/0ZOVK8VuHz7A4APWIWYn6OixF6NjJjz+V3dPYamUkAfA miw8QBPXvAQOdrLOEvG29YuRmbcbaHcenvIfH8i7MlAp/AwaJ6MpV+hVqD+tLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yhp0W5lzwztWL; Tue, 28 Jan 2025 01:41: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 50S1fFAm030445; Tue, 28 Jan 2025 01:41:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50S1fF8P030442; Tue, 28 Jan 2025 01:41:15 GMT (envelope-from git) Date: Tue, 28 Jan 2025 01:41:15 GMT Message-Id: <202501280141.50S1fF8P030442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: aa90fbed151d - main - Standardize the definition of a UFS dinode. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa90fbed151de512ab6e59f75df009533a15751f Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=aa90fbed151de512ab6e59f75df009533a15751f commit aa90fbed151de512ab6e59f75df009533a15751f Author: Kirk McKusick AuthorDate: 2025-01-28 01:39:45 +0000 Commit: Kirk McKusick CommitDate: 2025-01-28 01:39:45 +0000 Standardize the definition of a UFS dinode. Each program that operates on UFS on-disk inodes defines its own version of a dinode. They all (of necessity) define the same layout but use different names. This change adds a definition of a dinode (a union of a UFS1 on-disk inode and a UFS2 on-disk inode) as well as a dinodep (a union of a pointer to a UFS1 on-disk inode and a pointer to a UFS2 on-disk inode) in sys/ufs/ufs/dinode.h. It then deletes the definitions of dinode and dinodep in all the programs that operate on them and instead uses these standard definitions. No functional change intended. MFC-after: 1 week --- lib/libufs/libufs.h | 8 ---- sbin/dump/traverse.c | 4 -- sbin/fsck_ffs/fsck.h | 4 -- sbin/fsck_ffs/inode.c | 12 ++++-- sbin/newfs/mkfs.c | 4 -- sbin/quotacheck/quotacheck.c | 4 -- stand/libsa/ufs.c | 11 ++---- sys/ufs/ufs/dinode.h | 20 ++++++++-- sys/ufs/ufs/inode.h | 9 ++--- usr.sbin/makefs/ffs.c | 22 +++++------ usr.sbin/makefs/ffs/ufs_inode.h | 81 +++++++++++++++++++---------------------- usr.sbin/quot/quot.c | 4 -- 12 files changed, 82 insertions(+), 101 deletions(-) diff --git a/lib/libufs/libufs.h b/lib/libufs/libufs.h index 45ac97f43c06..b91866164e64 100644 --- a/lib/libufs/libufs.h +++ b/lib/libufs/libufs.h @@ -37,14 +37,6 @@ */ #define LIBUFS_BUFALIGN 128 -/* - * libufs structures. - */ -union dinodep { - struct ufs1_dinode *dp1; - struct ufs2_dinode *dp2; -}; - /* * userland ufs disk. */ diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index ccc2d0a625e9..d3bb671644e3 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -51,10 +51,6 @@ #include "dump.h" -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; #define DIP(dp, field) \ ((sblock->fs_magic == FS_UFS1_MAGIC) ? \ (dp)->dp1.field : (dp)->dp2.field) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 312142eab9a7..32d1d93e05c8 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -75,10 +75,6 @@ #define INOBUFSIZE 64*1024 /* size of buffer to read inodes in pass1 */ #define ZEROBUFSIZE (dev_bsize * 128) /* size of zero buffer used by -Z */ -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; #define DIP(dp, field) \ ((sblock.fs_magic == FS_UFS1_MAGIC) ? \ (dp)->dp1.field : (dp)->dp2.field) diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 5b004cd29c90..dca479f43831 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -429,6 +429,7 @@ void ginode(ino_t inumber, struct inode *ip) { ufs2_daddr_t iblk; + union dinodep dpp; struct ufs2_dinode *dp; if (inumber < UFS_ROOTINO || inumber >= maxino) @@ -466,11 +467,12 @@ ginode(ino_t inumber, struct inode *ip) if (sblock.fs_magic == FS_UFS1_MAGIC) { ip->i_dp = (union dinode *) &ip->i_bp->b_un.b_dinode1[inumber - ip->i_bp->b_index]; + dpp.dp1 = (struct ufs1_dinode *)ip->i_dp; return; } ip->i_dp = (union dinode *) &ip->i_bp->b_un.b_dinode2[inumber - ip->i_bp->b_index]; - dp = (struct ufs2_dinode *)ip->i_dp; + dpp.dp2 = dp = (struct ufs2_dinode *)ip->i_dp; /* Do not check hash of inodes being created */ if (dp->di_mode != 0 && ffs_verify_dinode_ckhash(&sblock, dp)) { pwarn("INODE CHECK-HASH FAILED"); @@ -520,6 +522,7 @@ getnextinode(ino_t inumber, int rebuiltcg) mode_t mode; ufs2_daddr_t ndb, blk; union dinode *dp; + union dinodep dpp; struct inode ip; static caddr_t nextinop; @@ -550,10 +553,13 @@ getnextinode(ino_t inumber, int rebuiltcg) nextinop = inobuf.b_un.b_buf; } dp = (union dinode *)nextinop; - if (sblock.fs_magic == FS_UFS1_MAGIC) + if (sblock.fs_magic == FS_UFS1_MAGIC) { nextinop += sizeof(struct ufs1_dinode); - else + dpp.dp1 = (struct ufs1_dinode *)dp; + } else { nextinop += sizeof(struct ufs2_dinode); + dpp.dp2 = (struct ufs2_dinode *)dp; + } if ((ckhashadd & CK_INODE) != 0) { ffs_update_dinode_ckhash(&sblock, (struct ufs2_dinode *)dp); dirty(&inobuf); diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index db1fe2991f6d..3715ef58ad0f 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -89,10 +89,6 @@ static struct csum *fscs; #define sblock disk.d_fs #define acg disk.d_cg -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; #define DIP(dp, field) \ ((sblock.fs_magic == FS_UFS1_MAGIC) ? \ (dp)->dp1.field : (dp)->dp2.field) diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c index 1fb4789ae348..1871d2efc25a 100644 --- a/sbin/quotacheck/quotacheck.c +++ b/sbin/quotacheck/quotacheck.c @@ -77,10 +77,6 @@ union { long dev_bsize = 1; ino_t maxino; -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; #define DIP(dp, field) \ ((sblock.fs_magic == FS_UFS1_MAGIC) ? \ (dp)->dp1.field : (dp)->dp2.field) diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c index 2c3b3764bd74..e1d540ed2321 100644 --- a/stand/libsa/ufs.c +++ b/stand/libsa/ufs.c @@ -110,10 +110,7 @@ struct fs_ops ufs_fsops = { struct file { off_t f_seekp; /* seek pointer */ struct fs *f_fs; /* pointer to super-block */ - union dinode { - struct ufs1_dinode di1; - struct ufs2_dinode di2; - } f_di; /* copy of on-disk inode */ + union dinode f_dp; /* copy of on-disk inode */ int f_nindir[UFS_NIADDR]; /* number of blocks mapped by indirect block at level i */ @@ -129,7 +126,7 @@ struct file { }; #define DIP(fp, field) \ ((fp)->f_fs->fs_magic == FS_UFS1_MAGIC ? \ - (fp)->f_di.di1.field : (fp)->f_di.di2.field) + (fp)->f_dp.dp1.field : (fp)->f_dp.dp2.field) typedef struct ufs_mnt { char *um_dev; @@ -185,10 +182,10 @@ read_inode(ino_t inumber, struct open_file *f) } if (fp->f_fs->fs_magic == FS_UFS1_MAGIC) - fp->f_di.di1 = ((struct ufs1_dinode *)buf) + fp->f_dp.dp1 = ((struct ufs1_dinode *)buf) [ino_to_fsbo(fs, inumber)]; else - fp->f_di.di2 = ((struct ufs2_dinode *)buf) + fp->f_dp.dp2 = ((struct ufs2_dinode *)buf) [ino_to_fsbo(fs, inumber)]; /* diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h index 673e6f2555f1..5265326b0b5b 100644 --- a/sys/ufs/ufs/dinode.h +++ b/sys/ufs/ufs/dinode.h @@ -111,12 +111,13 @@ typedef int64_t ufs_time_t; #define IFWHT 0160000 /* Whiteout. */ /* - * A dinode contains all the meta-data associated with a UFS2 file. - * This structure defines the on-disk format of a dinode. Since + * Each UFS filesystem version defines the on-disk format of its dinode. + * + * A UFS2 dinode contains all the meta-data associated with a UFS2 file. + * This structure defines the on-disk format of a UFS2 dinode. Since * this structure describes an on-disk structure, all its fields * are defined by types with precise widths. */ - #define UFS_NXADDR 2 /* External addresses in inode. */ #define UFS_NDADDR 12 /* Direct addresses in inode. */ #define UFS_NIADDR 3 /* Indirect addresses in inode. */ @@ -210,4 +211,17 @@ struct ufs1_dinode { #define UFS_LINK_MAX 65500 /* leave a few spare for special values */ +/* + * These structures hold or reference an on-disk dinode. + */ +union dinode { + struct ufs1_dinode dp1; + struct ufs2_dinode dp2; +}; + +union dinodep { + struct ufs1_dinode *dp1; + struct ufs2_dinode *dp2; +}; + #endif /* _UFS_UFS_DINODE_H_ */ diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index 85d3c4898318..a8a91e67b34a 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -88,10 +88,7 @@ struct inode { /* * The real copy of the on-disk inode. */ - union { - struct ufs1_dinode *din1; /* UFS1 on-disk dinode. */ - struct ufs2_dinode *din2; /* UFS2 on-disk dinode. */ - } dinode_u; + union dinodep i_dp; /* On-disk dinode */ ino_t i_number; /* The identity of the inode. */ uint32_t i_flag; /* flags, see below */ @@ -204,8 +201,8 @@ struct inode { #define i_dirhash i_un.dirhash #define i_snapblklist i_un.snapblklist -#define i_din1 dinode_u.din1 -#define i_din2 dinode_u.din2 +#define i_din1 i_dp.dp1 +#define i_din2 i_dp.dp2 #define ITOUMP(ip) ((ip)->i_ump) #define ITODEV(ip) (ITOUMP(ip)->um_dev) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index ebfda7f929e4..aa5574c5201f 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -106,7 +106,7 @@ #undef DIP #define DIP(dp, field) \ ((ffs_opts->version == 1) ? \ - (dp)->ffs1_din.di_##field : (dp)->ffs2_din.di_##field) + (dp)->dp1.di_##field : (dp)->dp2.di_##field) /* * Various file system defaults (cribbed from newfs(8)). @@ -853,10 +853,10 @@ ffs_populate_dir(const char *dir, fsnode *root, fsinfo_t *fsopts) /* build on-disk inode */ if (ffs_opts->version == 1) - membuf = ffs_build_dinode1(&din.ffs1_din, &dirbuf, cur, + membuf = ffs_build_dinode1(&din.dp1, &dirbuf, cur, root, fsopts); else - membuf = ffs_build_dinode2(&din.ffs2_din, &dirbuf, cur, + membuf = ffs_build_dinode2(&din.dp2, &dirbuf, cur, root, fsopts); if (debug & DEBUG_FS_POPULATE_NODE) { @@ -942,11 +942,11 @@ ffs_write_file(union dinode *din, uint32_t ino, void *buf, fsinfo_t *fsopts) in.i_number = ino; in.i_size = DIP(din, size); if (ffs_opts->version == 1) - memcpy(&in.i_din.ffs1_din, &din->ffs1_din, - sizeof(in.i_din.ffs1_din)); + memcpy(&in.i_din.dp1, &din->dp1, + sizeof(in.i_din.dp1)); else - memcpy(&in.i_din.ffs2_din, &din->ffs2_din, - sizeof(in.i_din.ffs2_din)); + memcpy(&in.i_din.dp2, &din->dp2, + sizeof(in.i_din.dp2)); if (DIP(din, size) == 0) goto write_inode_and_leave; /* mmm, cheating */ @@ -1176,16 +1176,16 @@ ffs_write_inode(union dinode *dp, uint32_t ino, const fsinfo_t *fsopts) ffs_rdfs(d, fs->fs_bsize, buf, fsopts); if (fsopts->needswap) { if (ffs_opts->version == 1) - ffs_dinode1_swap(&dp->ffs1_din, + ffs_dinode1_swap(&dp->dp1, &dp1[ino_to_fsbo(fs, ino)]); else - ffs_dinode2_swap(&dp->ffs2_din, + ffs_dinode2_swap(&dp->dp2, &dp2[ino_to_fsbo(fs, ino)]); } else { if (ffs_opts->version == 1) - dp1[ino_to_fsbo(fs, ino)] = dp->ffs1_din; + dp1[ino_to_fsbo(fs, ino)] = dp->dp1; else - dp2[ino_to_fsbo(fs, ino)] = dp->ffs2_din; + dp2[ino_to_fsbo(fs, ino)] = dp->dp2; } ffs_wtfs(d, fs->fs_bsize, buf, fsopts); free(buf); diff --git a/usr.sbin/makefs/ffs/ufs_inode.h b/usr.sbin/makefs/ffs/ufs_inode.h index 050392624739..c960caea5c1e 100644 --- a/usr.sbin/makefs/ffs/ufs_inode.h +++ b/usr.sbin/makefs/ffs/ufs_inode.h @@ -37,11 +37,6 @@ * SUCH DAMAGE. */ -union dinode { - struct ufs1_dinode ffs1_din; - struct ufs2_dinode ffs2_din; -}; - struct inode { ino_t i_number; /* The identity of the inode. */ struct vnode *i_devvp; /* vnode pointer (contains fsopts) */ @@ -50,45 +45,45 @@ struct inode { uint64_t i_size; }; -#define i_ffs1_atime i_din.ffs1_din.di_atime -#define i_ffs1_atimensec i_din.ffs1_din.di_atimensec -#define i_ffs1_blocks i_din.ffs1_din.di_blocks -#define i_ffs1_ctime i_din.ffs1_din.di_ctime -#define i_ffs1_ctimensec i_din.ffs1_din.di_ctimensec -#define i_ffs1_db i_din.ffs1_din.di_db -#define i_ffs1_flags i_din.ffs1_din.di_flags -#define i_ffs1_gen i_din.ffs1_din.di_gen -#define i_ffs11_gid i_din.ffs1_din.di_gid -#define i_ffs1_ib i_din.ffs1_din.di_ib -#define i_ffs1_mode i_din.ffs1_din.di_mode -#define i_ffs1_mtime i_din.ffs1_din.di_mtime -#define i_ffs1_mtimensec i_din.ffs1_din.di_mtimensec -#define i_ffs1_nlink i_din.ffs1_din.di_nlink -#define i_ffs1_rdev i_din.ffs1_din.di_rdev -#define i_ffs1_shortlink i_din.ffs1_din.di_shortlink -#define i_ffs1_size i_din.ffs1_din.di_size -#define i_ffs1_uid i_din.ffs1_din.di_uid +#define i_ffs1_atime i_din.dp1.di_atime +#define i_ffs1_atimensec i_din.dp1.di_atimensec +#define i_ffs1_blocks i_din.dp1.di_blocks +#define i_ffs1_ctime i_din.dp1.di_ctime +#define i_ffs1_ctimensec i_din.dp1.di_ctimensec +#define i_ffs1_db i_din.dp1.di_db +#define i_ffs1_flags i_din.dp1.di_flags +#define i_ffs1_gen i_din.dp1.di_gen +#define i_ffs11_gid i_din.dp1.di_gid +#define i_ffs1_ib i_din.dp1.di_ib +#define i_ffs1_mode i_din.dp1.di_mode +#define i_ffs1_mtime i_din.dp1.di_mtime +#define i_ffs1_mtimensec i_din.dp1.di_mtimensec +#define i_ffs1_nlink i_din.dp1.di_nlink +#define i_ffs1_rdev i_din.dp1.di_rdev +#define i_ffs1_shortlink i_din.dp1.di_shortlink +#define i_ffs1_size i_din.dp1.di_size +#define i_ffs1_uid i_din.dp1.di_uid -#define i_ffs2_atime i_din.ffs2_din.di_atime -#define i_ffs2_atimensec i_din.ffs2_din.di_atimensec -#define i_ffs2_blocks i_din.ffs2_din.di_blocks -#define i_ffs2_ctime i_din.ffs2_din.di_ctime -#define i_ffs2_ctimensec i_din.ffs2_din.di_ctimensec -#define i_ffs2_birthtime i_din.ffs2_din.di_birthtime -#define i_ffs2_birthnsec i_din.ffs2_din.di_birthnsec -#define i_ffs2_db i_din.ffs2_din.di_db -#define i_ffs2_flags i_din.ffs2_din.di_flags -#define i_ffs2_gen i_din.ffs2_din.di_gen -#define i_ffs21_gid i_din.ffs2_din.di_gid -#define i_ffs2_ib i_din.ffs2_din.di_ib -#define i_ffs2_mode i_din.ffs2_din.di_mode -#define i_ffs2_mtime i_din.ffs2_din.di_mtime -#define i_ffs2_mtimensec i_din.ffs2_din.di_mtimensec -#define i_ffs2_nlink i_din.ffs2_din.di_nlink -#define i_ffs2_rdev i_din.ffs2_din.di_rdev -#define i_ffs2_shortlink i_din.ffs2_din.di_shortlink -#define i_ffs2_size i_din.ffs2_din.di_size -#define i_ffs2_uid i_din.ffs2_din.di_uid +#define i_ffs2_atime i_din.dp2.di_atime +#define i_ffs2_atimensec i_din.dp2.di_atimensec +#define i_ffs2_blocks i_din.dp2.di_blocks +#define i_ffs2_ctime i_din.dp2.di_ctime +#define i_ffs2_ctimensec i_din.dp2.di_ctimensec +#define i_ffs2_birthtime i_din.dp2.di_birthtime +#define i_ffs2_birthnsec i_din.dp2.di_birthnsec +#define i_ffs2_db i_din.dp2.di_db +#define i_ffs2_flags i_din.dp2.di_flags +#define i_ffs2_gen i_din.dp2.di_gen +#define i_ffs21_gid i_din.dp2.di_gid +#define i_ffs2_ib i_din.dp2.di_ib +#define i_ffs2_mode i_din.dp2.di_mode +#define i_ffs2_mtime i_din.dp2.di_mtime +#define i_ffs2_mtimensec i_din.dp2.di_mtimensec +#define i_ffs2_nlink i_din.dp2.di_nlink +#define i_ffs2_rdev i_din.dp2.di_rdev +#define i_ffs2_shortlink i_din.dp2.di_shortlink +#define i_ffs2_size i_din.dp2.di_size +#define i_ffs2_uid i_din.dp2.di_uid #undef DIP #define DIP(ip, field) \ diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 7ca8110bef76..4152c498371a 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -97,10 +97,6 @@ static void quot(char *, char *); (((fs)->fs_magic == FS_UFS1_MAGIC ? sizeof(struct ufs1_dinode) : \ sizeof(struct ufs2_dinode)) * INOCNT(fs)) -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; #define DIP(fs, dp, field) \ (((fs)->fs_magic == FS_UFS1_MAGIC) ? \ (dp)->dp1.field : (dp)->dp2.field) From nobody Tue Jan 28 05:03:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhtTT0Tpgz5lycW; Tue, 28 Jan 2025 05:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YhtTS6Ws4z3H8t; Tue, 28 Jan 2025 05:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738040588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8gxhXnyQnOe3AwqzpCI6WH6CWQLObowSmi/0rdUqKn0=; b=ZtbkSs4XtXawijAaU2FQRTdgeIkV+hD2seUVQ6ExMItMAWlTXA51O9wH/J2KD2+znEt6m2 SRLxU1cwrtfQf9XnZez0/NY4Y3NIJ4XMFjTVhsPjzvOajMfffAOYGGRtGAG3+PBYGZqHIO stWxxfvgibt+6GfIWZN2/WyacxFnmsdUuCZGkHCC1ONeK+aZ9GFqYlXYTvDWZKOXFbMzOM Uwa0bHqU1eGdeW48tn6n0+c5QuLFWjuwHeIABNJZmi87YgfI6ZMlbVDBMbswM1gSKf8W45 J7EKRJYTlgqPUp9L0q7jJlzjciZlCMLMHZLBaePvopOnT0ziwgDtniwFdup8Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738040588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8gxhXnyQnOe3AwqzpCI6WH6CWQLObowSmi/0rdUqKn0=; b=lefTipCv28MEoVhGWhhyR6LMokD7zFVLcGyagOljrCx1hD1saPNDXVTwbeSMe3eFpMwDvX ENpAirDrYDxt1E2x/VXApBU6+c+w0eu9EkaCvxcjf7mxq3RrquAfVHXBBXq+n2rwhNbw17 JLpd2Yufrt+XNwvkWKXSepGgOYd8I9t8HWfvZJyjN3icNcOG5hd9KPLl5vnQdP5srnNm+C zHdzxK1+H+tfC8zeF1khj6R3NXbMhAAAECcIVqWQuLO9QkjMWs968PoUG0xHQwWKttIspk prHtLdm9HB8vG9x5IiNXJjFeIaFqlaYh8nLfxJ5+Z/BaPSmjdEfjIC9i4aLO7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738040588; a=rsa-sha256; cv=none; b=K0TNQ98jQXwZXwUt87SODLH4d0/cQvJLsXUvyN8UK6SRLtcjhIfFdprv4e6HjHGGTl5HgV ytAgyjUgAPIY+uj5w6DZHImxPagmMsEO3WEdvVXBpGFnGQj1RRF9VcuKhfzNCmnumJGVpk O/pC3md4aifGWyglQigou/l2fjI2yWQizRN3BTD8BlT6kzootOqXAmCcM2BPEhqFJXPrBy gEKljQeS5lUzrlBpeLvJ7Asz/9wtJKGGPPDjBWtbhwC8LeV3xdefDr8bNZDyYX28e16u0O 7LKmRxOcu7N/D57P7iDizyjHF7qbtOghDbidagtuUilWY+SCQ7MTfgxKrfd8Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhtTS65qvz10ZV; Tue, 28 Jan 2025 05:03: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 50S53837010922; Tue, 28 Jan 2025 05:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50S5385J010919; Tue, 28 Jan 2025 05:03:08 GMT (envelope-from git) Date: Tue, 28 Jan 2025 05:03:08 GMT Message-Id: <202501280503.50S5385J010919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 06bf119f265c - main - sockets/tcp: quick fix for regression with SO_REUSEPORT_LB List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06bf119f265c38c0ed16a1461fdc43356c3edf7a Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=06bf119f265c38c0ed16a1461fdc43356c3edf7a commit 06bf119f265c38c0ed16a1461fdc43356c3edf7a Author: Gleb Smirnoff AuthorDate: 2025-01-28 05:02:22 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-28 05:02:22 +0000 sockets/tcp: quick fix for regression with SO_REUSEPORT_LB There was a long living problem that pr_listen is called every time on consecutive listen(2) syscalls. Up until today it produces spurious TCP state change events in tracing software and other harmless problems. But with 7cbb6b6e28db we started to call LIST_REMOVE() twice on the same entry. This is quite ugly, but quick and robust fix against regression, that we decided to put in the scope of the January stabilization week. A better refactoring will happen later. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D48703 Fixes: 7cbb6b6e28db33095a1cf7a8887921a5ec969824 --- sys/netinet/tcp_usrreq.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 3e73e448a9f7..c6713a0bb4cb 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -355,9 +355,10 @@ out: static int tcp_usr_listen(struct socket *so, int backlog, struct thread *td) { - int error = 0; struct inpcb *inp; struct tcpcb *tp; + int error = 0; + bool already_listening; inp = sotoinpcb(so); KASSERT(inp != NULL, ("tcp_usr_listen: inp == NULL")); @@ -369,6 +370,7 @@ tcp_usr_listen(struct socket *so, int backlog, struct thread *td) tp = intotcpcb(inp); SOCK_LOCK(so); + already_listening = SOLISTENING(so); error = solisten_proto_check(so); if (error != 0) { SOCK_UNLOCK(so); @@ -390,6 +392,8 @@ tcp_usr_listen(struct socket *so, int backlog, struct thread *td) solisten_proto_abort(so); } SOCK_UNLOCK(so); + if (already_listening) + goto out; if (error == 0) in_pcblisten(inp); @@ -408,10 +412,11 @@ out: static int tcp6_usr_listen(struct socket *so, int backlog, struct thread *td) { - int error = 0; struct inpcb *inp; struct tcpcb *tp; u_char vflagsav; + int error = 0; + bool already_listening; inp = sotoinpcb(so); KASSERT(inp != NULL, ("tcp6_usr_listen: inp == NULL")); @@ -425,6 +430,7 @@ tcp6_usr_listen(struct socket *so, int backlog, struct thread *td) vflagsav = inp->inp_vflag; SOCK_LOCK(so); + already_listening = SOLISTENING(so); error = solisten_proto_check(so); if (error != 0) { SOCK_UNLOCK(so); @@ -449,6 +455,8 @@ tcp6_usr_listen(struct socket *so, int backlog, struct thread *td) solisten_proto_abort(so); } SOCK_UNLOCK(so); + if (already_listening) + goto out; if (error == 0) in_pcblisten(inp); From nobody Tue Jan 28 08:48:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YhzTt3R6Nz5mH4g; Tue, 28 Jan 2025 08:48: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 4YhzTt2mSyz3ftw; Tue, 28 Jan 2025 08:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738054130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XkkQaevZjhulbxfrksQwAREkluLkKciWULjMWnw08II=; b=p741jYr2D5TNu+7Y/G8DnhA+nCl9jgJy3euwMsti7FZbqPJSFhkWfTDReUwzWJPX7fLwzg DVfUGkz1e7tibUxpKNmzDcMAXzIgUkYqXk+xm1cEvTHBR5HIqzPozh4i+LopxkM4RWSDyi ApIxdSP/EwBps2X4uxtA2nf32d2ZEsI0htIi4/7aI94qXGoPejl4BScMQtEbphlMwKls8O POkZ0AlLKcjDCbowbpaW4UIdMSwwQXxHuqaLFprNqmi3iNeIuDRW58jDUe3d9dh954uUEm ojV/umxoCWpU+KjPNtrA1SvnM3VF8JS2IyQy1CSjGKfjiklifHINRIQw6bIp0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738054130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XkkQaevZjhulbxfrksQwAREkluLkKciWULjMWnw08II=; b=HtNMHyWNAyU+qXOnS2+YYlM0Of9F9c6tCtolV7sRp7Bu7LoVYVFMXme6NOY3WA4HtFNTkp VmDx2yKPodc9SzjxFF7Z61c5KxjuoulmXivwgMleSjjrM8RMi9Sf2bN4ii1VJMucRCGAXZ pL9BCUbfGaBm0vlTePeManCUqHmhpo8nAqoFhqDb1DEM6w4IP9HHfWAQEUpCgvUK0Vtt5p A5cYzB9UburEWjrJU1q5ttVP46tUHUNIdRE8refJGwzJoisQM9x/rnUP+3vlvqNFByNeC7 UJpBrJzesnUguuDYNc+zx8tp2i6Cks5agPDS51RqyfkYBHChOjsXQ+1pxuObQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738054130; a=rsa-sha256; cv=none; b=LWg0jDaBITtjmA64NnRHjf2x2bsYD36BAq3uxSkJizAth1Otk1mZpcXBnrRAs/cOBYL5X1 0Am0psVUIyklD3GXcrYwDc5xAMWrLaDZTu9a33AJwV8+ivyPzyOJNA1dP72DSWE75cTZTY fRtHQOO4sMV0b6wOt3+uqJR8RaTxJ8AszzsdfDcjq0LHUOmsgJCjphhcKBDOceGf+Nog4g NaB4lIeLBYxM9uxWtreJD5tXHg5FNJGnLJ1BirwZUG5A60nxUFdTm6MjkdhicfBN6Iz3uc Vxz8Mfk2HOMJWcSki48jP20+Py+mJnvjuTpUcdVa0Z0sh+KwmNpCDHjZXXuoOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YhzTt2HnVz16qD; Tue, 28 Jan 2025 08:48: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 50S8modq021991; Tue, 28 Jan 2025 08:48:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50S8movd021988; Tue, 28 Jan 2025 08:48:50 GMT (envelope-from git) Date: Tue, 28 Jan 2025 08:48:50 GMT Message-Id: <202501280848.50S8movd021988@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 256389eaf158 - main - Fix build from aa90fbed151de5 by eliminating an unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 256389eaf158acaf67f0530764be8af68edee78c Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=256389eaf158acaf67f0530764be8af68edee78c commit 256389eaf158acaf67f0530764be8af68edee78c Author: Kirk McKusick AuthorDate: 2025-01-28 08:47:31 +0000 Commit: Kirk McKusick CommitDate: 2025-01-28 08:48:42 +0000 Fix build from aa90fbed151de5 by eliminating an unused variable. --- sbin/fsck_ffs/inode.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index dca479f43831..c3ae283b7198 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -429,7 +429,6 @@ void ginode(ino_t inumber, struct inode *ip) { ufs2_daddr_t iblk; - union dinodep dpp; struct ufs2_dinode *dp; if (inumber < UFS_ROOTINO || inumber >= maxino) @@ -467,12 +466,10 @@ ginode(ino_t inumber, struct inode *ip) if (sblock.fs_magic == FS_UFS1_MAGIC) { ip->i_dp = (union dinode *) &ip->i_bp->b_un.b_dinode1[inumber - ip->i_bp->b_index]; - dpp.dp1 = (struct ufs1_dinode *)ip->i_dp; return; } ip->i_dp = (union dinode *) &ip->i_bp->b_un.b_dinode2[inumber - ip->i_bp->b_index]; - dpp.dp2 = dp = (struct ufs2_dinode *)ip->i_dp; /* Do not check hash of inodes being created */ if (dp->di_mode != 0 && ffs_verify_dinode_ckhash(&sblock, dp)) { pwarn("INODE CHECK-HASH FAILED"); @@ -522,7 +519,6 @@ getnextinode(ino_t inumber, int rebuiltcg) mode_t mode; ufs2_daddr_t ndb, blk; union dinode *dp; - union dinodep dpp; struct inode ip; static caddr_t nextinop; @@ -555,10 +551,8 @@ getnextinode(ino_t inumber, int rebuiltcg) dp = (union dinode *)nextinop; if (sblock.fs_magic == FS_UFS1_MAGIC) { nextinop += sizeof(struct ufs1_dinode); - dpp.dp1 = (struct ufs1_dinode *)dp; } else { nextinop += sizeof(struct ufs2_dinode); - dpp.dp2 = (struct ufs2_dinode *)dp; } if ((ckhashadd & CK_INODE) != 0) { ffs_update_dinode_ckhash(&sblock, (struct ufs2_dinode *)dp); From nobody Tue Jan 28 13:42:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yj60y4Fmzz5lS9q; Tue, 28 Jan 2025 13:42:42 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yj60x6b5nz3QcN; Tue, 28 Jan 2025 13:42:41 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.48 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none) Received: by mail-io1-f48.google.com with SMTP id ca18e2360f4ac-844bff5ba1dso423352439f.1; Tue, 28 Jan 2025 05:42:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738071760; x=1738676560; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iiLTcjIjltCCqjukfbY/jKch8JXkIh8svEGD9YDg2po=; b=iPouJ0Nf2hiC4o3EoMrb7goa4/YeMDUUiK4ZXCMGktlzoT90BRnDe50Sgiy6uD1lO7 b96ow3zI6lI51K5wduD6AoMw2DtLPZA8/sepfCaCSEFBlvjSwvP6rVttoSYbq1TV1MF8 oXnB+7n/xocZCz+s6ve41B1f4+qm0qFLXVgXd86X2aBCKEY8YuhvtAEc5axxLwL48xby RlEn6xd/1kxWj6I/lMRKOOk8OQoDnGAEEJyMjUWoO1195xV992qbecuLOBu7MKSKCwsT LVLZvVZ6m7kiylyH96KVB+lXiWV69YYOhWAVnBATKm6tQKRfcNMq7Jr7lQcZmgrpHVio BwTQ== X-Forwarded-Encrypted: i=1; AJvYcCW8dQhOLTtNkPv2AnhPWeiZPnrhwVvNe+R6Vd0r1MFdOQKFgXC+dSO/k711BSFncQoie2HtXnfi9CynW2j+fTcwe6YLPlo=@freebsd.org, AJvYcCWMNrXm+2v1Y0YwUuBBl3OFtorj3SZnAooGelGdVemqyR0Z0YbSI/lXBH6LqIwRKJX6R16wzuWGYTxvlWWPt5otO8jM@freebsd.org, AJvYcCWPj3zMklQkUQdtj3tpymOMErw9vZ3nrNs+7yFH6l9t301Ck7bnkuo5MLXLLsnnriZv+fJLZDkGtku3O2L0LQg=@freebsd.org X-Gm-Message-State: AOJu0YzMhPlTfKbnPf5gAfq2PEv2rBfhVpak/kp08DATSSx+gPZE7NGN PC87iprNF4Vncs2+AdbljGMsGldCFFty3Lg9bpbLcJMSX0w0s/utRc7NOZ/pLlOm0nTFUoxfPRK MrfqOCz3AwNl6zeTwNhu4fDMiluU/zw== X-Gm-Gg: ASbGncs9E4u+c1rqTayOALlO6JP3L6zsCNsRomtaUyhiEaa3wRiJwZXcUxtZvF2MSbL yNDZPFDZbRR0VcGRAoXsYwh4yYZscSx5S5mulC/QIxCV1OOVxr6VXchdcoY9UAPWe7mVw0huS6W MWJ1gvjgSE4WkhAZZQNlpTGL1tCkNhOAc= X-Google-Smtp-Source: AGHT+IFplDleIgzPTOUexm3upeRsp77jKBzi6zNGgs1a2CtZMrrYayFIWdUospWAxqk4mcp6/sd86B1c1MDzyGpfgP8= X-Received: by 2002:a05:6602:751a:b0:843:ec18:82e2 with SMTP id ca18e2360f4ac-851b623f79bmr3931602039f.8.1738071760520; Tue, 28 Jan 2025 05:42:40 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202501251308.50PD8Qsg042260@gitrepo.freebsd.org> <81A8E695-5034-4945-8D07-DF95E76904D0@freebsd.org> <9fec6bfae287dfc123a359c3e1164ae2@FreeBSD.org> <6C70A3E0-CC6D-4B0B-96A8-70636F08AC6B@freebsd.org> <3e0e88c0031d9c3e1f6232f2949f8909@FreeBSD.org> In-Reply-To: <3e0e88c0031d9c3e1f6232f2949f8909@FreeBSD.org> From: Ed Maste Date: Tue, 28 Jan 2025 08:42:28 -0500 X-Gm-Features: AWEUYZls7Pr-jJP-Vo-r_YMmrEW6parZs-Qmd_bD_7EB5M-rWH-UlfNxkV_i8b0 Message-ID: Subject: Re: git: f934e629dc22 - main - Add stack clash protection to the WITH_SSP flag To: Alexander Leidinger Cc: Jessica Clarke , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-1.47 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; RBL_SENDERSCORE_REPUT_6(1.00)[209.85.166.48:from]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.87)[-0.866]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; BAD_REP_POLICIES(0.10)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.48:from]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; MISSING_XM_UA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.48:from]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_SPF_ALLOW(0.00)[+ip4:209.85.128.0/17]; FREEFALL_USER(0.00)[carpeddiem]; RCPT_COUNT_FIVE(0.00)[5] X-Spamd-Bar: - X-Rspamd-Queue-Id: 4Yj60x6b5nz3QcN On Sun, 26 Jan 2025 at 07:38, Alexander Leidinger wr= ote: > > Am 2025-01-25 20:21, schrieb Jessica Clarke: > > > It looks like with Clang we end up using -Qunused-arguments so the > > warning/error is suppressed. That at least means the build doesn=E2=80= =99t > > fail, which I suppose is good, but I=E2=80=99m not sure we should be pr= omising > > that WITH_SSP will protect against stack clash then having the compiler > > silently emit unprotected code (for which we=E2=80=99re to blame, by te= lling it > > to ignore the fact it=E2=80=99s not supported). This at least needs to = be > > documented that the protection will only be provided if supported by > > the compiler. I suppose we should add support for stack clash to COMPILER_FEATURES in bsd.compiler.mk and add the flag only if supported. > function correctly. > supports stack overflow protection using the Stack Smashing Protector > .Pq SSP > compiler feature, > -and stack clash protection. > +and stack clash protection (if supported by the compiler for the given > architecture). To make it explicitly clear that the "if supported" applies only to stack clash protection, maybe make it a separate sentence. ... SSP compiler feature. Stack clash protection is also enabled, if supported by the compiler for the given architecture. Looks good to me either way. From nobody Tue Jan 28 14:22:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yj6tz1kSfz5lWs5; Tue, 28 Jan 2025 14:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yj6tz11H0z3XVW; Tue, 28 Jan 2025 14:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738074155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOqvwju38L4L3QwV5qAABbRRvUybBc54w7RlWeodLp8=; b=NOaBIoRXKKch7mMXXPNxy/y7Q8+ieWvIffOvx+rOcIKI7+jHGxD3prQwZ18Vz8yXXCj3Y7 1LJwC5BXKhEoW3x9U59LvwdtSrES88bl+Q47hb+AAZrKCZQwSJ4AcEjkB5PK2eN8tUaHqh uQzokAXhlGvHFc/1GKRElna9uyh2QnmH943hXUYE5u07EJgXc1wBIxn6k9FsW2D90B72gK DeTwChEwaWfSQeiDRBW8215cBJRqzquCoHiIHVcXn4ICU9BkV7itl18wVvLG5KndcEEgik MkApiz/iKPJCMiTlpxALJ1vhqbN70R4wK7pASjrjllYB/3sG4fJLatTJEqREng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738074155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOqvwju38L4L3QwV5qAABbRRvUybBc54w7RlWeodLp8=; b=DfdW3PwNaUXYwO4drWU1EGYbjY1PiHIwrqUQGjVlTt5rf7I3Kpy2aFlFz0pkFADlsTxtkC 7WnAcBsCpE/gFr1C4zzC5gEHXdbuiTvns+wEQM39YdpE8064L02Cu61sLS3Pt1TM0Ckd/G uLQ8sjzF+eoYIhfz+Z8opqUKGvfK5PJdD43YgAIo6OS1PrPRuta/RA1+uwMiNXOOAzAJpg Krvd7O/2SittDPqr89rBQ5uf9qIxJbwx73lyAHUIVaPeJTJ0+kM41UMwQXf6IxIUE9/h7x 9Yv2ErCFxWPFMyy3ykJd52n6ztJTnlUjXbRvc1bFz4tb/+pl/N3sPRU5pm+Igw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738074155; a=rsa-sha256; cv=none; b=ntocDZKOIHUGyj25GFdcgR23eXDksqPjYc+CTyBKcXWuMXZYK6VOoWPViHhHamR4S6yKzF ps2popQ0w7s+9c/w1EEsX/XvUclbjIXc4CwzJzasxQX5nHROBAFmQcLyz0Y/VlASaEKULU fRspOg0c2YjN4PvPkUGHoIMXQ161g9lFZL6O9dBeHzG5rb+GuzbhvX8wyFCNWhnohAHbfP aQ/kxp+aWnh+xtrCTu4DdGqB+ClMeKLoJwvyYP3UgjTZvc4SslcESAzYDoBUbLrcE/i/73 x7SpLLwWeuecKrN42q78MKCAa1n/9HnXW9xLjhDAZwz6h3QeYVVfrX/lgoPZZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yj6tz0YfDz3WB; Tue, 28 Jan 2025 14:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50SEMYYx057641; Tue, 28 Jan 2025 14:22:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SEMY1R057638; Tue, 28 Jan 2025 14:22:34 GMT (envelope-from git) Date: Tue, 28 Jan 2025 14:22:34 GMT Message-Id: <202501281422.50SEMY1R057638@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 63efd7f5ac66 - main - socket tests: Add a test which calls listen() twice on an lb socket List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63efd7f5ac6675b5a780adf52b91ee089d8b2665 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=63efd7f5ac6675b5a780adf52b91ee089d8b2665 commit 63efd7f5ac6675b5a780adf52b91ee089d8b2665 Author: Mark Johnston AuthorDate: 2025-01-27 22:23:08 +0000 Commit: Mark Johnston CommitDate: 2025-01-28 14:22:20 +0000 socket tests: Add a test which calls listen() twice on an lb socket This exercises commit 06bf119f265c ("sockets/tcp: quick fix for regression with SO_REUSEPORT_LB") Reviewed by: glebius MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D48702 --- tests/sys/netinet/so_reuseport_lb_test.c | 58 ++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index 3ce09fcf5794..09d8e0ce8f83 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -377,11 +377,69 @@ ATF_TC_BODY(concurrent_add, tc) } } +/* + * Try calling listen(2) twice on a socket with SO_REUSEPORT_LB set. + */ +ATF_TC_WITHOUT_HEAD(double_listen_ipv4); +ATF_TC_BODY(double_listen_ipv4, tc) +{ + struct sockaddr_in sin; + int error, s; + + s = lb_listen_socket(PF_INET, 0); + + memset(&sin, 0, sizeof(sin)); + sin.sin_len = sizeof(sin); + sin.sin_family = AF_INET; + sin.sin_port = htons(0); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + error = bind(s, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = listen(s, 1); + ATF_REQUIRE_MSG(error == 0, "listen() failed: %s", strerror(errno)); + error = listen(s, 2); + ATF_REQUIRE_MSG(error == 0, "listen() failed: %s", strerror(errno)); + + error = close(s); + ATF_REQUIRE_MSG(error == 0, "close() failed: %s", strerror(errno)); +} + +/* + * Try calling listen(2) twice on a socket with SO_REUSEPORT_LB set. + */ +ATF_TC_WITHOUT_HEAD(double_listen_ipv6); +ATF_TC_BODY(double_listen_ipv6, tc) +{ + struct sockaddr_in6 sin6; + int error, s; + + s = lb_listen_socket(PF_INET6, 0); + + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_len = sizeof(sin6); + sin6.sin6_family = AF_INET6; + sin6.sin6_port = htons(0); + sin6.sin6_addr = in6addr_loopback; + error = bind(s, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = listen(s, 1); + ATF_REQUIRE_MSG(error == 0, "listen() failed: %s", strerror(errno)); + error = listen(s, 2); + ATF_REQUIRE_MSG(error == 0, "listen() failed: %s", strerror(errno)); + + error = close(s); + ATF_REQUIRE_MSG(error == 0, "close() failed: %s", strerror(errno)); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, basic_ipv4); ATF_TP_ADD_TC(tp, basic_ipv6); ATF_TP_ADD_TC(tp, concurrent_add); + ATF_TP_ADD_TC(tp, double_listen_ipv4); + ATF_TP_ADD_TC(tp, double_listen_ipv6); return (atf_no_error()); } From nobody Tue Jan 28 14:29:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yj72d0Ldbz5lXBy; Tue, 28 Jan 2025 14:29: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 4Yj72c6xfMz3Ynm; Tue, 28 Jan 2025 14:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738074553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WC9t3o0xLKa2z7CTN8gmw5q7Cde9iXntOQCQ7nFGVWo=; b=SPgheLNp6zi8o8CEwL0XYWxuMgr699Nfm6fLI6gVxkKQQ3T3jEtXyN6CRaOWyT/gR+z0KO Dtur7w4u2+0r2V9W4nTgQmhUICd5na5dacgZGBO6OaEQceYhq7e0BPgw93b0hQdgsc6olV xSDkl/9xWjggLKnJodbtuy6aMkRqjVRCwPQP1txggMXhZrXR0YcnX14vUMo3z5xHdXeJ9t MbbpT1SP4SspFRtQJaMbI7tJWtVEhnJQ0Mja688fNcvs86gwuNfSeCvOBMAJLzzKB2+Csz G81uI/t7dODPjcD/6Dw01TWxfP9pO7ULiElmxuzwYIfj3tm8r6r/w4l19go1PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738074553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WC9t3o0xLKa2z7CTN8gmw5q7Cde9iXntOQCQ7nFGVWo=; b=Psrsm6y0HUbfPuZhoR0XXicmTuzCZfUR7TPQA7U4V37t/DqcOE8XuhQhAerJGtuwAbBCLk A2+OPTSg9Q1fcv2uRLk18SEnleiE6KOE/cUgveKRW2nKJko77MB+Z0ZTduRRPMb5EunGIl K6JrhtT6zPaFswHa3lP57kg7Spvx88Y0nm296tRrCbvtQdtwjcmGClxLz725j9Vsb4DkH6 Wy+SOdwfPX23XWirmqNUrV7hhL/iwnPPuESkH+3w43bOWjigBGIGfKTstbNvNqym08tp2m yS9zUAb8vMofbhFX7MoXX/KGKQQW+UASHHfwST5UHGhTbQgH/n509Yw3YLwndA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738074553; a=rsa-sha256; cv=none; b=kdljrClJ5Rp1ZoPVA50XuQk7vfLsNQUCaa+og1fVYnSgN8vZGmCJZhlpxLwt3rSrtqyvgR eCYuB2eaHNwqaIhkO1lFfLP2Vjh0cDHwNeIr7zOeTZsW+rhYVLV8nMM6IrfPnC6nrbxKd9 gYFYgiv9R/m3WJDlboNfwGNnclB8fc33bU/kmEXl+HYsVMYwKmQCV5vhpQ2BIiTwapWPLD 5TQs+K/yVjqP18/0Derr+SoSj1ze48IRy2+fi8Vl9xHUjNbqZBMqikGQTFuSGIWJeNH9cf BTw/9CjlQwy2r1a7cytKTqoY2mIEfgz8ooKlSG8vQrJ7O+NPxKY8x4ldoX1qig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yj72c6NGLz3q4; Tue, 28 Jan 2025 14:29: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 50SETCFZ060181; Tue, 28 Jan 2025 14:29:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SETCck060178; Tue, 28 Jan 2025 14:29:12 GMT (envelope-from git) Date: Tue, 28 Jan 2025 14:29:12 GMT Message-Id: <202501281429.50SETCck060178@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c43ae7ab4bf8 - main - etcupdate: Restrict access to the conflicts directory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c43ae7ab4bf89c2b274c1cbefe663c456e9211d1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c43ae7ab4bf89c2b274c1cbefe663c456e9211d1 commit c43ae7ab4bf89c2b274c1cbefe663c456e9211d1 Author: Mark Johnston AuthorDate: 2025-01-28 14:23:06 +0000 Commit: Mark Johnston CommitDate: 2025-01-28 14:23:06 +0000 etcupdate: Restrict access to the conflicts directory In the window during conflict resolution, copies of installed files with conflicts are added here with the default mode. Restrict access. PR: 277470 Reviewed by: philip, jhb, emaste Differential Revision: https://reviews.freebsd.org/D48576 --- usr.sbin/etcupdate/etcupdate.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index 39d1f9e56a54..7bddd6593b56 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -1611,6 +1611,9 @@ EOF # Initialize conflicts and warnings handling. rm -f $WARNINGS mkdir -p $CONFLICTS + if ! chmod 0700 ${CONFLICTS}; then + panic "Unable to set permissions on conflicts directory" + fi # Ignore removed files for the pre-world case. A pre-world # update uses a stripped-down tree. From nobody Tue Jan 28 15:11:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yj7zx41yYz5lbTk; Tue, 28 Jan 2025 15:11: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 4Yj7zx3GNjz3gKm; Tue, 28 Jan 2025 15:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738077117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Whx825c78O5M+l6KIxASblFvDeDf4U2h5WZ6hpZ7Mo=; b=b5eaxlYHhCBJnTeActiUMmXn/XUHL3FMpfHY/8iJiGJG6BAlRL3I/Cx6gCAA42nAQIer8f 1YQwVHQLbXeSP9V4Xp+O8Ot9J+QGRo/vQ1C6qqUcLPC6UrRUq1jx5dGvZwfLfYDtDr0zGG up73vfSVr/4ygLJxg/webQPbm7KtEzR9E1qr4IMK7kp7KAdRr6sIPoeoeOT3RI2BEYF7GK BDbo6ZtOPryWOJGH39aXZ56VchrDSVkXUPNg/BgIT+Se9tgjOZJogoPPX97RXI7wfrwSZ8 yKKd8W0shL7WCpA7IbN36eRT/mX7sR8yCNb0qm1fGWnAc476wHQv/sHGj81vYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738077117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Whx825c78O5M+l6KIxASblFvDeDf4U2h5WZ6hpZ7Mo=; b=Wj4IBBIuuUJ8Av/jtPN6t1yNzB0mYupBlMdZZS1XIs346++i0eI1U4+7FjApJ4mk5i3pkC gdY7+wpcf9gp/iEyVboVfq4r6rqGZ06Ya1nCvtAn0z7GH0svuStEGyfOdlpHuvtAMFmrXO d6zYAJxrI9Vp/m/M45NDIFRjQezBG0AuyC6TYFpE9Cv55+Cd9VmdQvbImp1yuklAWj8cCW 7RzPR2GdedjzWycpRxN9Xxe/P8555Mv5tkLUTIfslpLVstJG7pPdeCP1TdZ46ANyA/v/VJ /dPpsO9m3A4VMexisYcl+izys2VuSKBuIa4R0Ghv6U7TjadJ4U4hFulN1+8wbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738077117; a=rsa-sha256; cv=none; b=mHbYirzeA3XKQATMF/cjqT6kJjinJkczqxUR6zzpMJIM1Sz9G600VVtLD5BJoUX0CpvRDV 4nWna276qVsdQBYwJOc5lZ00i52OuwiAMeprlWGYG/x8Mmp2SusHu0WOMnX0Lz2urI+2Db 62vLix6B66NcBjPo8TwDrHu1mE9sWvPOhk1o/WkK98O8Ou8Qlz4Okj4cNdeYn8gJ4KWA+0 9nvh9TU2XfXSThbltzYrT2DZX8g89uRnjrf7uA7RVKeuNwirNesL+dCaYjmOlnIc2znllu Q2NdC6+YGnlgB0OYl4Xu4FJx40cMVYWkmHNXl3YJFYL8ZgwZzsoy5/hVq6n9NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yj7zx2t2Fz4Zq; Tue, 28 Jan 2025 15:11: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 50SFBvUK047254; Tue, 28 Jan 2025 15:11:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SFBv2k047251; Tue, 28 Jan 2025 15:11:57 GMT (envelope-from git) Date: Tue, 28 Jan 2025 15:11:57 GMT Message-Id: <202501281511.50SFBv2k047251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5289625dfecb - main - zinject: Fix format string errors on 32-bit platforms List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5289625dfecb962e0410dfafc403aced3b9a2e4b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5289625dfecb962e0410dfafc403aced3b9a2e4b commit 5289625dfecb962e0410dfafc403aced3b9a2e4b Author: Mark Johnston AuthorDate: 2025-01-28 15:11:24 +0000 Commit: Mark Johnston CommitDate: 2025-01-28 15:11:24 +0000 zinject: Fix format string errors on 32-bit platforms Fixes: c6767dc1f236 ("zfs: merge openzfs/zfs@34205715e") --- sys/contrib/openzfs/cmd/zinject/zinject.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sys/contrib/openzfs/cmd/zinject/zinject.c b/sys/contrib/openzfs/cmd/zinject/zinject.c index 4374e69a7f94..459daa727d77 100644 --- a/sys/contrib/openzfs/cmd/zinject/zinject.c +++ b/sys/contrib/openzfs/cmd/zinject/zinject.c @@ -453,10 +453,11 @@ print_data_handler(int id, const char *pool, zinject_record_t *record, (void) printf("%3d %-15s %-6llu %-6llu %-8s %-3d 0x%02x %-15s " - "%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_objset, + "%6llu %6llu\n", id, pool, (u_longlong_t)record->zi_objset, (u_longlong_t)record->zi_object, type_to_name(record->zi_type), record->zi_level, record->zi_dvas, rangebuf, - record->zi_match_count, record->zi_inject_count); + (u_longlong_t)record->zi_match_count, + (u_longlong_t)record->zi_inject_count); return (0); } @@ -490,9 +491,10 @@ print_device_handler(int id, const char *pool, zinject_record_t *record, (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f; (void) printf("%3d %-15s %llx %-5s %-10s %8.4f%% " - "%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_guid, + "%6llu %6llu\n", id, pool, (u_longlong_t)record->zi_guid, iotype_to_str(record->zi_iotype), err_to_str(record->zi_error), - freq, record->zi_match_count, record->zi_inject_count); + freq, (u_longlong_t)record->zi_match_count, + (u_longlong_t)record->zi_inject_count); return (0); } @@ -525,10 +527,11 @@ print_delay_handler(int id, const char *pool, zinject_record_t *record, (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f; (void) printf("%3d %-15s %llx %10llu %5llu %8.4f%% " - "%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_guid, + "%6llu %6llu\n", id, pool, (u_longlong_t)record->zi_guid, (u_longlong_t)NSEC2MSEC(record->zi_timer), - (u_longlong_t)record->zi_nlanes, - freq, record->zi_match_count, record->zi_inject_count); + (u_longlong_t)record->zi_nlanes, freq, + (u_longlong_t)record->zi_match_count, + (u_longlong_t)record->zi_inject_count); return (0); } From nobody Tue Jan 28 18:32:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjDRg4jbJz5lwKH for ; Tue, 28 Jan 2025 18:32:47 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjDRf1mVbz3VpL for ; Tue, 28 Jan 2025 18:32:46 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4361f65ca01so63448995e9.1 for ; Tue, 28 Jan 2025 10:32:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738089165; x=1738693965; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=huBeTx4i3pVXwBrySPJc+nsfwsufI4c4tL9kbEbGigo=; b=tvtyt0j1MtnQcFcJCgMuglJ1i09eeAo7C30XvkpIeqBxHPWEWeMwqNorD0zrQxG2Mb tHfwtRF/l6eF9p3eThZmacLA/NMj8/O6UN+fzkz6iAAzZkqrwsGXpxtqmIv2Cu5/iBcE Lxs1jOwhA8YYVjCsieFt661Q4vUYQl5W0O87+oxOGueejH7NwBiNsToLFdRnSnZNrkuL Yd0VFlj8VPjZkYJ4fjQmWcq4w1Bgxng/i9pcEqnO38PbkAPaKNn4bnFE8Vjme4FPJc/m nUabm00eeHTPfCVON3ciM4mXfnsD6Pwx7nnpTBZkOZoeON32A4xqiz8aaZnWUM/jkcvU mYPw== X-Forwarded-Encrypted: i=1; AJvYcCVuVjtxqVwOrAC8vm9t14BR80Wvtfsr5VpRuhR8F40XrHDeAb18TkNU+I1m+INfDgmQIfEBXSCSfJBQe9JytjiyCPPxHg==@freebsd.org X-Gm-Message-State: AOJu0YzjuRRJPBm1VI9p7gmaX4+FXvWuj92bwkkUpqaGAohetNmpLMlt XBLNw994BqPHbP1ciswRoBje2EsSodHIDdA7jeqElw8XkGiSLV3PC0l2oV6rI/k= X-Gm-Gg: ASbGncudOoMcfpuFQvwI+j6Brtk9nYW5wfH2GTuHQcZ40Xr6aqqqinstKre+RC/v2Rg wK46bFLwq1qHNwUoXHmnL8aqJMtUFS0yKk48GHG6HLq5TTETdk6UlcT1FOFxln93yQfEClWt4CA Nes6UMKA6KukybeNoPhG24RjobcXptKfE4dbx1pj4d965CVwgpWM2Xp6W3LJp+A2Y73aletTeOa M8zV7Ea+Vahw6LO5kjjz0/FEiQhjRQcR1V6Fzz42tEsQysIRKlf+w50KkUCvr08mrR3G2K0Gc5+ L/NfdRKNry+TrvafI6kH1Hazdg1lwg== X-Google-Smtp-Source: AGHT+IFIzGLZSePkDA6Bqp1glMO0N/RoNZEhk1fdblP14vzaAQxhQiIIOUBZcHCWoULYnSJG0b1BRg== X-Received: by 2002:a05:600c:5027:b0:434:f5c0:3288 with SMTP id 5b1f17b1804b1-43891430ed1mr410363525e9.29.1738089164548; Tue, 28 Jan 2025 10:32:44 -0800 (PST) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c2a1c4212sm14366613f8f.87.2025.01.28.10.32.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jan 2025 10:32:44 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.300.87.4.3\)) Subject: Re: git: c3450ad127e9 - main - clang: re-downgrade implicit int/function declarations to warning only From: Jessica Clarke In-Reply-To: <202306222111.35MLBAqB066211@gitrepo.freebsd.org> Date: Tue, 28 Jan 2025 18:32:33 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202306222111.35MLBAqB066211@gitrepo.freebsd.org> To: Dimitry Andric X-Mailer: Apple Mail (2.3826.300.87.4.3) X-Spamd-Result: default: False [-1.01 / 15.00]; RBL_SENDERSCORE_REPUT_6(1.00)[209.85.128.45:from]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.91)[-0.908]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; BAD_REP_POLICIES(0.10)[]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_SPF_ALLOW(0.00)[+ip4:209.85.128.0/17:c]; TO_DN_EQ_ADDR_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; R_DKIM_NA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.45:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.45:from] X-Spamd-Bar: - X-Rspamd-Queue-Id: 4YjDRf1mVbz3VpL On 22 Jun 2023, at 22:11, Dimitry Andric wrote: > The branch main has been updated by dim: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc3450ad127e94d3fa67ae337310e59c0= 02f51bfc >=20 > commit c3450ad127e94d3fa67ae337310e59c002f51bfc > Author: Dimitry Andric > AuthorDate: 2023-04-25 19:24:04 +0000 > Commit: Dimitry Andric > CommitDate: 2023-06-22 18:22:33 +0000 >=20 > clang: re-downgrade implicit int/function declarations to warning = only >=20 > This reapplies upstream commit c0141f3c300f by Aaron Ballman: >=20 > Downgrade implicit int and implicit function declaration to = warning only >=20 > The changes in Clang 15.0.0 which enabled these diagnostics as a > warning which defaulted to an error caused disruption for people > working on distributions such as Gentoo. There was an explicit = request > to downgrade these to be warning-only in Clang 15.0.1 with the > expectation that Clang 16 will default the diagnostics to an = error. >=20 > See > = https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror= -implicit-function-declaration/65213 > for more details on the discussion. >=20 > See https://reviews.llvm.org/D133800 for the public review of = these > changes. >=20 > As noted in the upstream discussion, there are many programs that = fail > to configure or build correctly, if these warnings are turned into > errors by default. >=20 > Note that most affected programs in ports are relatively old, and = are > unlikely to be fixed by actually adjusting their declarations, but = by > compiling with -std=3Dgnu89, which downgrades the errors back to = warning > again. Lots of tedious work for very little gain. This remains as a downstream divergence 1.5 years later, but I do not think we should be carrying this indefinitely. Software needs to build with upstream LLVM, and the fact that many ports do not is now biting us for CheriBSD where we use our own external toolchain that does not have such a diff. In my opinion this should be reverted for FreeBSD 15 and it=E2=80=99s long time for ports people to step up or have the = broken ports removed; we can=E2=80=99t keep going on like this with abandonware = holding back forward progress. Jess From nobody Tue Jan 28 20:09:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjGbD06hFz5m3ys; Tue, 28 Jan 2025 20:09: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjGbC5t56z3p6q; Tue, 28 Jan 2025 20:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738094967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BN6kgyn3bIBR/RPD0RgzIND0mXTwk7S3ttv2g60fHP4=; b=Z9LdPh6VX3lK2IRtNwILhmSVacncVzQcLkxssvFl4TVAfaz0RQDHCjgGiFcWftleyQ/E3K tBYpPtk3mBchmbVYNFVYsyEw65xdtqev/NkIbQTDnTxn4f4mraJoRannW/xzpt7Vnks5d6 ZzShbLN0J0dt9K4z5uFtiYh6E3k6I7rLJTv0Uc+F58ChMDpPTOMDldyOQdU1ZgjH/gVCrr p+6zzVfLwrxrKmlzsPtSxOwBdEqE9JrDHiJ1ljrgP3j7o+D6JqZD21rroS5ybUfe3ap8MI DPuC1ruennu1ep8tK/M3txUAMz15+CRPOXgcrB99fGhXFucox8gUlM2FQx8zXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738094967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BN6kgyn3bIBR/RPD0RgzIND0mXTwk7S3ttv2g60fHP4=; b=wXo+FALYpzUKSnXcjhlj5Fs7iJIcgTqsyYl56k5UXVCqjTGFM7kAMgD5zHe9CdHtzTeSXS ctNFbnpujgDVSeFDoOleWq/MW0x1JxiiPnILTWASwx8u4hI1W3q1vd7mAv+3TbMxtz/NnQ LPnsV7ufaaYj1zmsBoEDIaFVmAGMkzk7C1kk+DUDoRIUCyvBvjlOzZJlmq2LKZMgR8B0nY uO/X51mF4nsG7JpjtuXOmBcm3nV6i5u86wZmbnFLPTdWvSs/CrFeoVu2Qm3j7Im+HOVSN+ TFJ4w/cSYbq5qtcABFcBOX9VFeGh8mlxZ8ZtsAHsogKPEWFmSshiSz56MgDLuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738094967; a=rsa-sha256; cv=none; b=iZdUAcDnY0cEHcqh/+I32w0lcnwvgssjj7GDPTq/Oa/W+Qwj/mCGHhk9QcpuqMiujgYtR8 7dMvIxDmuBOVeCZlWodRpL8VwCXrn6A3ihz2/zV4TOEc5/fvnBjxXiCIVKrdGSqJsuWuFA nvaqbltYtDmVb4pygUegu7kSLxdbqTyUm4XMAZdoTbrYKJKmk3/JEXFg8V2LmNVKiFSJ1O AIBjwdKqwSega/vQDEgF1BrBVh9kdwOvEEGQdSSm3C/wRGzmzXWGCIE7k3iO6fWN1MiHsb z+cB5i/M2+1u9BQj/IoQVZqzPVRwtnHYFUSfbrDnCL6o7P01dsabULoLKwijpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YjGbC5BTDzTYN; Tue, 28 Jan 2025 20:09: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 50SK9RmT003616; Tue, 28 Jan 2025 20:09:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SK9Rtw003613; Tue, 28 Jan 2025 20:09:27 GMT (envelope-from git) Date: Tue, 28 Jan 2025 20:09:27 GMT Message-Id: <202501282009.50SK9Rtw003613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c64b3f32a570 - main - umass: Add comment for ASC/ASCQ 24h/00h INVALID FIELD IN CDB List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c64b3f32a570ede5c21a39a6c2ffec1ff41e5ff3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c64b3f32a570ede5c21a39a6c2ffec1ff41e5ff3 commit c64b3f32a570ede5c21a39a6c2ffec1ff41e5ff3 Author: Warner Losh AuthorDate: 2025-01-28 20:08:51 +0000 Commit: Warner Losh CommitDate: 2025-01-28 20:08:51 +0000 umass: Add comment for ASC/ASCQ 24h/00h INVALID FIELD IN CDB Add a comment for what this asc/ascq combo means. Very few people have this memorized. Sponsored by: Netflix --- sys/dev/usb/storage/umass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index e0daada72bdb..ba10a23d2987 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -2247,7 +2247,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb) /*sense_format*/ SSD_TYPE_NONE, /*current_error*/ 1, /*sense_key*/ SSD_KEY_ILLEGAL_REQUEST, - /*asc*/ 0x24, + /*asc*/ 0x24, /* 24h/00h INVALID FIELD IN CDB */ /*ascq*/ 0x00, /*extra args*/ SSD_ELEM_NONE); ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND; From nobody Tue Jan 28 23:20:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjLr62WgRz5mKJm; Tue, 28 Jan 2025 23:20:54 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjLr61xFXz3QQP; Tue, 28 Jan 2025 23:20:54 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738106454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IxfBpig+vgkjLkWA4cDhK3nBz/Ni4rIj11tbFZWNM8A=; b=EDvE6dYfwv8UlSu7VlaidQHMxQFbrfp2pkBuo/WbRLPxpRKJq6gKGqKE0o1lstvaKv3KVb 0YmJI+3W+gZQeB1KjBNg7y2c1Zs64YqmrviCHdOOd77u8xCnYn41qe+CbRXd/FdFJWKwak 69FSVyzVpnEfYt5Z8kBuzrjV2fFeCdx2/dO5QCI4qw4gh6PM9TCE0e6yQ/0s+fCEoPSldC w++0Jimr36uiREJ9JkJQprBKGNALb9feN41TIsU4O5OssHUASOxbbGVE00HC45a3r2WOiA 8zGCWatV5fUZt37hfbfyrHJUZwVMXH+vnMPBIFY7DiL7NP9xwkqbp0wAfmm/1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738106454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IxfBpig+vgkjLkWA4cDhK3nBz/Ni4rIj11tbFZWNM8A=; b=KHK0HMMn7I+FtkrjOwM0/EzPxItAspS6Ia8cDOgqp+RWpVHr3oB+WupZwmwSpG8ZWzuZpD UJpS2tVTRb0tF3zphdY/KvOZwSyXv3UV3dZsueAsAieKtv9mcANZP0rhbF7De8WOUeUafK iFYu2wQVizXOemoc+lpC+a0Ilod36tY11ZZHPOAFhzW1GyjPthAUDNLYMaH7XM7uBuZqZN LPMADUJ0RWBIE6XXY4SxrzH4sYAdtaj2RAM/NhU5iOWO2BSE+45gVL2YncCDFgHX3n2NKb bFB5yA8Jipd+pO0trLs2NgqbCpVcuJqJqFl2pFeuNZZA/DGuFyXbU8IVNwyOVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738106454; a=rsa-sha256; cv=none; b=QYK0ggE8Qp2oH1J9Zzqzmwgby18ed8fHAkB1HYDI7j72BeRLsKi2FL7+5BinWZoNLK7Q38 2BhrsTOyjRsVUSGmnw8GVX34N1JOHQ/e265TstVOnZoq364dWPpOmVtSMR3zR6w4J4rGs3 0xu1TwNFDaXFft2fJFYHIY1FB0WYUrJ4DZceTTfpsKQin1jr/UW62YWLi1ehInpdD4+G7Y UJ4jeWiQqyTikX1qH0OPUSKqPT8GCUqkjufU4ahVeAjWZiFVEajox/6CqLlbYf6fZul/UO wu/xIcVYCiToK9qbc5tHIrftfggz+q7WFQqD1jgyISDXW7w/3xvaeU/suKUmlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R10" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YjLr60d6jz1CRn; Tue, 28 Jan 2025 23:20:54 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id D70FA6ACE3; Wed, 29 Jan 2025 00:20:51 +0100 (CET) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6.1.9\)) Subject: Re: git: c3450ad127e9 - main - clang: re-downgrade implicit int/function declarations to warning only From: Dimitry Andric In-Reply-To: Date: Wed, 29 Jan 2025 00:20:51 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <90D8C9F1-0634-44E5-B5B5-20455A91E042@FreeBSD.org> References: <202306222111.35MLBAqB066211@gitrepo.freebsd.org> To: Jessica Clarke X-Mailer: Apple Mail (2.3731.700.6.1.9) On 28 Jan 2025, at 19:32, Jessica Clarke wrote: >=20 > On 22 Jun 2023, at 22:11, Dimitry Andric wrote: >=20 >> The branch main has been updated by dim: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc3450ad127e94d3fa67ae337310e59c0= 02f51bfc >>=20 >> commit c3450ad127e94d3fa67ae337310e59c002f51bfc >> Author: Dimitry Andric >> AuthorDate: 2023-04-25 19:24:04 +0000 >> Commit: Dimitry Andric >> CommitDate: 2023-06-22 18:22:33 +0000 >>=20 >> clang: re-downgrade implicit int/function declarations to warning = only >>=20 >> This reapplies upstream commit c0141f3c300f by Aaron Ballman: >>=20 >> Downgrade implicit int and implicit function declaration to = warning only >>=20 >> The changes in Clang 15.0.0 which enabled these diagnostics as a >> warning which defaulted to an error caused disruption for people >> working on distributions such as Gentoo. There was an explicit = request >> to downgrade these to be warning-only in Clang 15.0.1 with the >> expectation that Clang 16 will default the diagnostics to an = error. >>=20 >> See >> = https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror= -implicit-function-declaration/65213 >> for more details on the discussion. >>=20 >> See https://reviews.llvm.org/D133800 for the public review of = these >> changes. >>=20 >> As noted in the upstream discussion, there are many programs that = fail >> to configure or build correctly, if these warnings are turned into >> errors by default. >>=20 >> Note that most affected programs in ports are relatively old, and = are >> unlikely to be fixed by actually adjusting their declarations, but = by >> compiling with -std=3Dgnu89, which downgrades the errors back to = warning >> again. Lots of tedious work for very little gain. >=20 > This remains as a downstream divergence 1.5 years later, but I do not > think we should be carrying this indefinitely. Software needs to build > with upstream LLVM, and the fact that many ports do not is now biting > us for CheriBSD where we use our own external toolchain that does not > have such a diff. In my opinion this should be reverted for FreeBSD 15 > and it=E2=80=99s long time for ports people to step up or have the = broken ports > removed; we can=E2=80=99t keep going on like this with abandonware = holding back > forward progress. While I agree, at the least a full exp-run should be done, and even then you can't be entirely sure if ports that build are built the same as before, for example due to bad configure tests. So this is potentially a massive undertaking. -Dimitry From nobody Tue Jan 28 23:27:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjLzc3GCRz5mL5q; Tue, 28 Jan 2025 23:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjLzc2jsDz3RpR; Tue, 28 Jan 2025 23:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738106844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CaTkJJ8vTXx+dMF2CzhBX/E9vP7tyVTpHQyP360V1mE=; b=rrhV76Yaa427GBURIu746r317wo2KObohKgVeqWHvx/EBh9LFNy7/kktvvVr6EhTOq20wv U5tOs/yhgqQZx2mySYhHEpw6C56v5xeommCs9hQjEJrCyZLhSw5gyuL2m7q7Ph7/TyrCJt 8nJDsEvxcSsCDvmKORAb9SoHn5xcD6YaX1AORaFTIwyU9LZ5k4qBHYq9aNzNuJgZtFt+7e GL0HXTj8DOoRDx1IzrZ7+cV3pQMI4AY8lulbLrPryJOgqJcKLtBU8/IcvLp16l4n7BzZu3 gK2NMQBXb5SmDBHMnPir+zqdR7n4/bjmC6nieo37QTbAf91IYjjqSNvVsR/5pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738106844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CaTkJJ8vTXx+dMF2CzhBX/E9vP7tyVTpHQyP360V1mE=; b=DW6yjC9e5ZuZwjylZzSeOclfr3nN8EpSAYknV5x7AdZi0LlBu+m/qrL/jY/g5zgpcvOt0p 3YQnqYQCFrgG0A421oV7Iffa2CUke3Kagk10bWW4knmr420neuof7XJ02fu0VGm0MkkxjX m0woDXkb00fPFBBECTinfXujFYpeJhU+AXyk50YOmSjjs20900ZU/lH48ZEkwuKzrua5fm 8a0cetJhCdbvWbd6AUpvY2p0av93ba4kG3zahc6x4IS0S+h2sGeu+a2hR9Mqyn8/UN04TW Djh6+ms/MO/rjGaFZhTlF32k+tgZdLJFyc9/+9qFE4QltwjdDDf3W/pLywkd2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738106844; a=rsa-sha256; cv=none; b=QfaIlOvwbBS7sLRsrHQPFJ4r5NMlI9Dj3P/6LL7kXbPbcsD77rmfLoNx6I9LI6D1/6GW/k VSI5sJWAKLeXYV2ecXzEHhLD2b+tdm4tFZk1D5Jhf5jBdP75xC/O2U9ZImM3R5cqjnDOZv 7LJgOs7aOSTsQidEfs1wHa+b5yKwkYHf2Qh8UMuJ46rGTZJmIJTH+3FauYSRMOOWZAO8Pz sgflTeXrMH5HQRkOGCe5WTLcuuKZ3pWU3okpDDOUTi4/3zlYDFrMIXRwKB/x+vTLJNb95w Z0GnxXXnS3cpctPS9CquqLrEokfU3vDFWWnSxon9m9Jl6S7RPOiiHdHSRAnzZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YjLzc2005zcZc; Tue, 28 Jan 2025 23:27: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 50SNROu0076074; Tue, 28 Jan 2025 23:27:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SNRO2r076071; Tue, 28 Jan 2025 23:27:24 GMT (envelope-from git) Date: Tue, 28 Jan 2025 23:27:24 GMT Message-Id: <202501282327.50SNRO2r076071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6ee34bca48a9 - main - crtbegin: accurately check for the end of .dtors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ee34bca48a9e0867d46b24a78855e225d46ddda Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6ee34bca48a9e0867d46b24a78855e225d46ddda commit 6ee34bca48a9e0867d46b24a78855e225d46ddda Author: Konstantin Belousov AuthorDate: 2025-01-27 19:21:20 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-28 22:59:20 +0000 crtbegin: accurately check for the end of .dtors not relying only on the end section marker, but also checking for the section size when iterating. Reported by: kargl Analyzed by: dim Reviewed by: andrew, dim Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48700 --- lib/csu/common/crtbegin.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c index d6978859af4a..06fe990052f7 100644 --- a/lib/csu/common/crtbegin.c +++ b/lib/csu/common/crtbegin.c @@ -66,19 +66,27 @@ static crt_func __DTOR_LIST__[] __section(".dtors") __used = { (crt_func)-1 }; +extern const char startof_dtors[] __asm(".startof..dtors") + __weak_symbol __hidden; +extern const char sizeof_dtors[] __asm(".sizeof..dtors") + __weak_symbol __hidden; + static void __do_global_dtors_aux(void) { crt_func fn; + uintptr_t dtors_end; int n; #ifdef SHARED run_cxa_finalize(); #endif + dtors_end = (uintptr_t)&startof_dtors + (uintptr_t)&sizeof_dtors; for (n = 1;; n++) { fn = __DTOR_LIST__[n]; - if (fn == (crt_func)0 || fn == (crt_func)-1) + if (fn == (crt_func)0 || fn == (crt_func)-1 || (dtors_end > 0 && + (uintptr_t)&__DTOR_LIST__[n] >= dtors_end)) break; fn(); } From nobody Tue Jan 28 23:27:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjLzd6StJz5mL43; Tue, 28 Jan 2025 23:27: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 4YjLzd27Kzz3Rk1; Tue, 28 Jan 2025 23:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738106845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BT4vGwxfaPDT2M/UaBzKFGW15RySwfUwAH6i0hsHJOU=; b=Sk5fZGYDXEOctoMt3b/9pk6Hwq6iLM/299FCqqWp+rQz9UtL81Nzr3ZWMRA+s4k4M1fTf/ T4DeRPZHy+6m21uTqdIHahAAZPryhUGBbYqW3ZPnz9yi2SIeLPVcXUhZttHHwj7Dbg9CFk jLSKRs4vFnpTa2X6GcHwpo6z1TmBR+cwdEOxznhImOVwdVfmznNloeakoynFNUO9v8L53K gNn5D8LS5TWuZMagKV9PBzR7Q9MOZ6pKTdmZvqVo47cTqoGao2G2GNRWWMjXi79np7sWTv tCPwwz9c61J6bQafG8DlDkd62wlp09btAF6XaGAFdTvvxJ/B0uR8PLe1RuIXzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738106845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BT4vGwxfaPDT2M/UaBzKFGW15RySwfUwAH6i0hsHJOU=; b=rZv5/9wuZCxfCHScEEGNRb+Sjq10072zN/VhkIgdTpM61PHx1bc/u0b55HMF5YbLx4J8hC lod9eq9nAxm7L7SxWv02vV3JXUwfMJldTlIyzE30WT3zUPiRjGuoy0q3VdZ4Eb9Dshi5o2 r4GMxFQwYP46jaaIGlF/hyUS/uaK7BGVtvOLBjktXi+wTBg2s3hkJFsM8RECX3WcIG04I1 uqdhsH2T9+pAVrElHWVL7DsKo+wkN6IFftNSaeBPVAkdo2WRM6xQC6TmC3HGrpAH9kXGhb LioGiNlKiabO+m8XeAV80usktXIsbU/3mRABeFhW7eKrc4LafTiX/zlYrUmSSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738106845; a=rsa-sha256; cv=none; b=aqMJnee+/yibH3qGoQqBx1TKK5lR0pkN1sjIAyX4twJQ0IIZoteN/jTvG/IY4mLjSpMFr2 k0aGAf3BnOQwjsrThzHKyQKYZ9z+OVHKGoV1q+cN4xdFpdA6dneWWYnTn4MRHIh2WzUL4P QA83V3LTBKa8WVWrH+GLsgF6tBmgxjvlIcncWzo0jHgLIk7UPQjj4GdjK14cbdcOiag5KW 82PEGUQAB6ywWrZo64ST5uqYDe+yFV9eytjb4RCMo78X/fgG8yHNq3Qp6/6cztIf6CfKpE kBYt7U2xlMUWXKOTjhrMRlN33hFRSnXrr822M/xk+ttZUi2Q6Nrj25n5CWNajg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YjLzd1WXKzcXs; Tue, 28 Jan 2025 23:27: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 50SNRP1X076107; Tue, 28 Jan 2025 23:27:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SNRPBw076104; Tue, 28 Jan 2025 23:27:25 GMT (envelope-from git) Date: Tue, 28 Jan 2025 23:27:25 GMT Message-Id: <202501282327.50SNRPBw076104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 21502f9a926c - main - crtend: accurately check for the start of .ctors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21502f9a926c7e0c24ce230bb029fde4bf570a14 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=21502f9a926c7e0c24ce230bb029fde4bf570a14 commit 21502f9a926c7e0c24ce230bb029fde4bf570a14 Author: Konstantin Belousov AuthorDate: 2025-01-27 20:38:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-28 22:59:20 +0000 crtend: accurately check for the start of .ctors For the hypothetic situation where crtbegin.o is not linked into the binary, but crtend.o is, which results in the missing starting sentinel in the ctors array, be careful to not iterate past the start of the section. Reviewed by: andrew, dim Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48700 --- lib/csu/common/crtend.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/csu/common/crtend.c b/lib/csu/common/crtend.c index d9259729bb0e..bf25c1d836a9 100644 --- a/lib/csu/common/crtend.c +++ b/lib/csu/common/crtend.c @@ -21,7 +21,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "crt.h" typedef void (*crt_func)(void); @@ -45,15 +45,22 @@ static crt_func __DTOR_END__[] __section(".dtors") __used = { (crt_func)0 }; +extern const char startof_ctors[] __asm(".startof..ctors") + __weak_symbol __hidden; + static void __do_global_ctors_aux(void) { crt_func fn; + uintptr_t ctors_start; int n; + ctors_start = (uintptr_t)&startof_ctors; for (n = 1;; n++) { fn = __CTOR_END__[-n]; - if (fn == (crt_func)0 || fn == (crt_func)-1) + if (fn == (crt_func)0 || fn == (crt_func)-1 || + (ctors_start > 0 && + (uintptr_t)&__CTOR_END__[-n] < ctors_start)) break; fn(); } From nobody Wed Jan 29 00:01:09 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjMkr74SJz5mNSX for ; Wed, 29 Jan 2025 00:01:24 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjMkr3K7pz3X1h for ; Wed, 29 Jan 2025 00:01:24 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4364a37a1d7so63763265e9.3 for ; Tue, 28 Jan 2025 16:01:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738108882; x=1738713682; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pgk2svU6KZmA/eyUkU0hmLhhxatWCThZx+rruoxxETk=; b=T/gmNTjKqJ1yx41KyywxYaFbHPPd+xZRC5jttWtQ2oIKVx3p+zFu3Dh4kSHl2AL8JF 7CnNC6sy7ClVzRBFcURKzGPOhgbTxebHhPV8trd1MsZT5zo2nRDSa5gLez6/RCHVdJ/b swXPt53D6RSsfroscuh3zKSdRJSOh9X+z9c0rzI4l7Q9myqpTm1EUP+5p4bSd2seIE+V sZBYCqP42nEqbsAYyN+RmySDhrugm5uCM7BSgNBSdQn910vxpLYvvhcXHLIO/eerlsxt 6HM6VTYTo4P/Hc4dmRVWkS/7QwysP7Vqvmh0acLhKAlx1tntFxNIKcmM+M/L/il7gdgP UJaA== X-Forwarded-Encrypted: i=1; AJvYcCVQ1vq0+LiIQkNHgwP5l0jQo/cd7ufgD4FPqLnLMdvMuvjF8h+JAHpeu4+GuJ5NdVOCS8hocjkPi6WbAhMQeMrkNHu94A==@freebsd.org X-Gm-Message-State: AOJu0YxPTMKAQgycvN9QEad00yolftHdKtf8hWlqcArut9giJ9nSEBrX 8q+axq0x5MU4/HGo5++oApORAtVhE1LtF7nbERnh656UF8ZWeTi86/JNcz665WTfdSEVArn1MWU O X-Gm-Gg: ASbGncu+QQRs73A59NZABTRgnqkNjPaWFN3Kr/cV+0J2VySfa8m6Y2f0Y8fyK4wdVjA ruunPkpgkRDvQzJGz+XCK+37kVs93ZsWM3+Fdb0IONbTUblk6smuxx3LmVBO7vgEJF+CfUB5aFZ i7rUgyIlPlLJ3T3um7t0yqDgk5XBtP28tA3AbUTDv+zQSnUj1cDbHEa9N9kZ2SRltMJuRqUKshD V4Ifu6V0mwKYo1mIRghpiQHNaXrzQo4V3D0gGGFfFxVrZSjdHox5lqBkhMaei5b3+vIWBVpua8t sItJ/cGZjEW2I69VlPO36DpRqQgAmQ== X-Google-Smtp-Source: AGHT+IGd3dnAKLdyOLMrH+iQy+Nu8JgHA8Q2V8iKPiOQRHPWr0EPpvYJ/sa4e4o5l+ofyZBdA6KdeQ== X-Received: by 2002:a5d:5988:0:b0:385:fd07:8616 with SMTP id ffacd0b85a97d-38c5167d80bmr760690f8f.0.1738108881692; Tue, 28 Jan 2025 16:01:21 -0800 (PST) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c2a188673sm15077691f8f.46.2025.01.28.16.01.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jan 2025 16:01:20 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.300.87.4.3\)) Subject: Re: git: c3450ad127e9 - main - clang: re-downgrade implicit int/function declarations to warning only From: Jessica Clarke In-Reply-To: <90D8C9F1-0634-44E5-B5B5-20455A91E042@FreeBSD.org> Date: Wed, 29 Jan 2025 00:01:09 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <277132FC-870F-48C7-A874-210789C71BD2@freebsd.org> References: <202306222111.35MLBAqB066211@gitrepo.freebsd.org> <90D8C9F1-0634-44E5-B5B5-20455A91E042@FreeBSD.org> To: Dimitry Andric X-Mailer: Apple Mail (2.3826.300.87.4.3) X-Rspamd-Queue-Id: 4YjMkr3K7pz3X1h X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 28 Jan 2025, at 23:20, Dimitry Andric wrote: > On 28 Jan 2025, at 19:32, Jessica Clarke wrote: >>=20 >> On 22 Jun 2023, at 22:11, Dimitry Andric wrote: >>=20 >>> The branch main has been updated by dim: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc3450ad127e94d3fa67ae337310e59c0= 02f51bfc >>>=20 >>> commit c3450ad127e94d3fa67ae337310e59c002f51bfc >>> Author: Dimitry Andric >>> AuthorDate: 2023-04-25 19:24:04 +0000 >>> Commit: Dimitry Andric >>> CommitDate: 2023-06-22 18:22:33 +0000 >>>=20 >>> clang: re-downgrade implicit int/function declarations to warning = only >>>=20 >>> This reapplies upstream commit c0141f3c300f by Aaron Ballman: >>>=20 >>> Downgrade implicit int and implicit function declaration to = warning only >>>=20 >>> The changes in Clang 15.0.0 which enabled these diagnostics as a >>> warning which defaulted to an error caused disruption for people >>> working on distributions such as Gentoo. There was an explicit = request >>> to downgrade these to be warning-only in Clang 15.0.1 with the >>> expectation that Clang 16 will default the diagnostics to an = error. >>>=20 >>> See >>> = https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror= -implicit-function-declaration/65213 >>> for more details on the discussion. >>>=20 >>> See https://reviews.llvm.org/D133800 for the public review of = these >>> changes. >>>=20 >>> As noted in the upstream discussion, there are many programs that = fail >>> to configure or build correctly, if these warnings are turned into >>> errors by default. >>>=20 >>> Note that most affected programs in ports are relatively old, and = are >>> unlikely to be fixed by actually adjusting their declarations, but = by >>> compiling with -std=3Dgnu89, which downgrades the errors back to = warning >>> again. Lots of tedious work for very little gain. >>=20 >> This remains as a downstream divergence 1.5 years later, but I do not >> think we should be carrying this indefinitely. Software needs to = build >> with upstream LLVM, and the fact that many ports do not is now biting >> us for CheriBSD where we use our own external toolchain that does not >> have such a diff. In my opinion this should be reverted for FreeBSD = 15 >> and it=E2=80=99s long time for ports people to step up or have the = broken ports >> removed; we can=E2=80=99t keep going on like this with abandonware = holding back >> forward progress. >=20 > While I agree, at the least a full exp-run should be done, and even = then > you can't be entirely sure if ports that build are built the same as > before, for example due to bad configure tests. So this is potentially = a > massive undertaking. I=E2=80=99m aware of the problem. Red Hat put in a lot of engineering = effort to find and fix such bugs. GCC 14.1 makes it an error by default for C99 too. Clang 16 kept it as an error. FreeBSD is now an outlier in turning this off, and non-obscure ports really should already be fixed if they=E2=80=99re being kept up-to-date. I appreciate that there will be = fallout, but we can=E2=80=99t just do nothing because nobody in ports has stepped = up in the past 1.5 years to act on this. We need to commit to this happening and then ports will have to deal with it. Otherwise another year will go by and we=E2=80=99ll still be doing this. Jess From nobody Wed Jan 29 02:21:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjQrX5Hftz5lb1N; Wed, 29 Jan 2025 02:21: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 4YjQrX4g3Nz3rRT; Wed, 29 Jan 2025 02:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738117292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fwtaQ5kHioPEk+9A1ngw8B7UqJFp+EZb1hQdLcn/TeI=; b=CH5UHMpSpwiBtnG0oU4MMBEqLbrzgSECiRGMM/ppi8vauUJccEHXNUysCMYZhBrPJF6DOu AjKCC/3cJFTzh5WldZRE0N1QOFj31SaTVnwVXm07cmMyNnA4l2u/ReuEwwl9x6+2BVZmsM DtDVwpU+TpJLUFb6NYJedU6vmBYpZsRzp+kW+QoZqO3PVCM2lR+407cntyLwfNiqKFQQrB PKo/8EpV4RLRB9i2uwHYM1oGLJNi/ki5Kxe8OAl8EQ/uVW3sSElXWwoO38cf5rJk59t0l9 vjbKbOh47tQFYMhOVN0TpfYVBpiicfyeDqJv4jbq+bLn89fB/DOAVGl0HFNEzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738117292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fwtaQ5kHioPEk+9A1ngw8B7UqJFp+EZb1hQdLcn/TeI=; b=KAivnypdz9dLulIIY2BEI9PoOng7ngTcRTRd4snlh4rnrl8uSsJWz/HEg1pNNGorX5OuRg OSVKOYkbUcmgnohsDUWouvSvCDatYX1vr1PXk8hb5hJLSlgB6jgUlSmx1/qg0tvObqpG6e h4TlkaFFp9roGfqR//x3241dXgVDEfzScmVuBINzT41Kfk4tPuWz6Qrjts/VBBUEnyd0DJ XPRqq+Qh8F3ME4cYi9k8SCP08ZbYv3PiN8wRcZaoWyQILT9Dw/pKjht6qaqFCP2IRTK2cY NekZaEcv7Djg5/oV2KAB4+m74AhdcGYMIiiLRL3bLm1YxXI/8sgaxaws+F0+5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738117292; a=rsa-sha256; cv=none; b=A+SQjps/+Bysb9sC7pZbaRyj3h/FiJeGsmlaxrxeY/GhlW4GkAR2UOydWG80m0v843eN10 vZBqOMzSpAXjwBllxeSRM7+l3wLEE9gZOHS2TxgI80GDeU4OAN0vlBKvZndVh00/41ixAs XBZBGQv/uCuOv0+gd0DkaLhtF2rxpkWFGnAP+tOgUpfhByPQCgXQpKCGWiIHes2tgGfu2i VeQ91rNdyz8kJLeAtqtgNHsH0nCm5W8aVZO4MkLBujaSZTV5Tj3Zg8KuXQAZr6hkR2xLqo zpu+ACSHpsv4dDHSWOtFmYbYMAWbzQ5CoOt2smUCuUlWRNqNKg0c4L1SOb6Uww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YjQrX4C3pzhvp; Wed, 29 Jan 2025 02:21: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 50T2LWGh006258; Wed, 29 Jan 2025 02:21:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50T2LWXr006255; Wed, 29 Jan 2025 02:21:32 GMT (envelope-from git) Date: Wed, 29 Jan 2025 02:21:32 GMT Message-Id: <202501290221.50T2LWXr006255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 51688136b161 - main - libdtrace: Use designators to initialize the opcode array List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51688136b161089b317edc34c3a3e9b40d54a18a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=51688136b161089b317edc34c3a3e9b40d54a18a commit 51688136b161089b317edc34c3a3e9b40d54a18a Author: Mark Johnston AuthorDate: 2025-01-29 00:59:21 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 00:59:21 +0000 libdtrace: Use designators to initialize the opcode array No functional change intended. MFC after: 2 weeks Sponsored by: Innovate UK --- .../opensolaris/lib/libdtrace/common/dt_dis.c | 160 ++++++++++----------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c index d1335180ec97..41765efb7717 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c @@ -348,86 +348,86 @@ dt_dis(const dtrace_difo_t *dp, FILE *fp) void (*op_func)(const dtrace_difo_t *, const char *, dif_instr_t, FILE *); } optab[] = { - { "(illegal opcode)", dt_dis_str }, - { "or", dt_dis_log }, /* DIF_OP_OR */ - { "xor", dt_dis_log }, /* DIF_OP_XOR */ - { "and", dt_dis_log }, /* DIF_OP_AND */ - { "sll", dt_dis_log }, /* DIF_OP_SLL */ - { "srl", dt_dis_log }, /* DIF_OP_SRL */ - { "sub", dt_dis_log }, /* DIF_OP_SUB */ - { "add", dt_dis_log }, /* DIF_OP_ADD */ - { "mul", dt_dis_log }, /* DIF_OP_MUL */ - { "sdiv", dt_dis_log }, /* DIF_OP_SDIV */ - { "udiv", dt_dis_log }, /* DIF_OP_UDIV */ - { "srem", dt_dis_log }, /* DIF_OP_SREM */ - { "urem", dt_dis_log }, /* DIF_OP_UREM */ - { "not", dt_dis_r1rd }, /* DIF_OP_NOT */ - { "mov", dt_dis_r1rd }, /* DIF_OP_MOV */ - { "cmp", dt_dis_cmp }, /* DIF_OP_CMP */ - { "tst", dt_dis_tst }, /* DIF_OP_TST */ - { "ba", dt_dis_branch }, /* DIF_OP_BA */ - { "be", dt_dis_branch }, /* DIF_OP_BE */ - { "bne", dt_dis_branch }, /* DIF_OP_BNE */ - { "bg", dt_dis_branch }, /* DIF_OP_BG */ - { "bgu", dt_dis_branch }, /* DIF_OP_BGU */ - { "bge", dt_dis_branch }, /* DIF_OP_BGE */ - { "bgeu", dt_dis_branch }, /* DIF_OP_BGEU */ - { "bl", dt_dis_branch }, /* DIF_OP_BL */ - { "blu", dt_dis_branch }, /* DIF_OP_BLU */ - { "ble", dt_dis_branch }, /* DIF_OP_BLE */ - { "bleu", dt_dis_branch }, /* DIF_OP_BLEU */ - { "ldsb", dt_dis_load }, /* DIF_OP_LDSB */ - { "ldsh", dt_dis_load }, /* DIF_OP_LDSH */ - { "ldsw", dt_dis_load }, /* DIF_OP_LDSW */ - { "ldub", dt_dis_load }, /* DIF_OP_LDUB */ - { "lduh", dt_dis_load }, /* DIF_OP_LDUH */ - { "lduw", dt_dis_load }, /* DIF_OP_LDUW */ - { "ldx", dt_dis_load }, /* DIF_OP_LDX */ - { "ret", dt_dis_ret }, /* DIF_OP_RET */ - { "nop", dt_dis_str }, /* DIF_OP_NOP */ - { "setx", dt_dis_setx }, /* DIF_OP_SETX */ - { "sets", dt_dis_sets }, /* DIF_OP_SETS */ - { "scmp", dt_dis_cmp }, /* DIF_OP_SCMP */ - { "ldga", dt_dis_lda }, /* DIF_OP_LDGA */ - { "ldgs", dt_dis_ldv }, /* DIF_OP_LDGS */ - { "stgs", dt_dis_stv }, /* DIF_OP_STGS */ - { "ldta", dt_dis_lda }, /* DIF_OP_LDTA */ - { "ldts", dt_dis_ldv }, /* DIF_OP_LDTS */ - { "stts", dt_dis_stv }, /* DIF_OP_STTS */ - { "sra", dt_dis_log }, /* DIF_OP_SRA */ - { "call", dt_dis_call }, /* DIF_OP_CALL */ - { "pushtr", dt_dis_pushts }, /* DIF_OP_PUSHTR */ - { "pushtv", dt_dis_pushts }, /* DIF_OP_PUSHTV */ - { "popts", dt_dis_str }, /* DIF_OP_POPTS */ - { "flushts", dt_dis_str }, /* DIF_OP_FLUSHTS */ - { "ldgaa", dt_dis_ldv }, /* DIF_OP_LDGAA */ - { "ldtaa", dt_dis_ldv }, /* DIF_OP_LDTAA */ - { "stgaa", dt_dis_stv }, /* DIF_OP_STGAA */ - { "sttaa", dt_dis_stv }, /* DIF_OP_STTAA */ - { "ldls", dt_dis_ldv }, /* DIF_OP_LDLS */ - { "stls", dt_dis_stv }, /* DIF_OP_STLS */ - { "allocs", dt_dis_r1rd }, /* DIF_OP_ALLOCS */ - { "copys", dt_dis_log }, /* DIF_OP_COPYS */ - { "stb", dt_dis_store }, /* DIF_OP_STB */ - { "sth", dt_dis_store }, /* DIF_OP_STH */ - { "stw", dt_dis_store }, /* DIF_OP_STW */ - { "stx", dt_dis_store }, /* DIF_OP_STX */ - { "uldsb", dt_dis_load }, /* DIF_OP_ULDSB */ - { "uldsh", dt_dis_load }, /* DIF_OP_ULDSH */ - { "uldsw", dt_dis_load }, /* DIF_OP_ULDSW */ - { "uldub", dt_dis_load }, /* DIF_OP_ULDUB */ - { "ulduh", dt_dis_load }, /* DIF_OP_ULDUH */ - { "ulduw", dt_dis_load }, /* DIF_OP_ULDUW */ - { "uldx", dt_dis_load }, /* DIF_OP_ULDX */ - { "rldsb", dt_dis_load }, /* DIF_OP_RLDSB */ - { "rldsh", dt_dis_load }, /* DIF_OP_RLDSH */ - { "rldsw", dt_dis_load }, /* DIF_OP_RLDSW */ - { "rldub", dt_dis_load }, /* DIF_OP_RLDUB */ - { "rlduh", dt_dis_load }, /* DIF_OP_RLDUH */ - { "rlduw", dt_dis_load }, /* DIF_OP_RLDUW */ - { "rldx", dt_dis_load }, /* DIF_OP_RLDX */ - { "xlate", dt_dis_xlate }, /* DIF_OP_XLATE */ - { "xlarg", dt_dis_xlate }, /* DIF_OP_XLARG */ + [0] = { "(illegal opcode)", dt_dis_str }, + [DIF_OP_OR] = { "or", dt_dis_log }, + [DIF_OP_XOR] = { "xor", dt_dis_log }, + [DIF_OP_AND] = { "and", dt_dis_log }, + [DIF_OP_SLL] = { "sll", dt_dis_log }, + [DIF_OP_SRL] = { "srl", dt_dis_log }, + [DIF_OP_SUB] = { "sub", dt_dis_log }, + [DIF_OP_ADD] = { "add", dt_dis_log }, + [DIF_OP_MUL] = { "mul", dt_dis_log }, + [DIF_OP_SDIV] = { "sdiv", dt_dis_log }, + [DIF_OP_UDIV] = { "udiv", dt_dis_log }, + [DIF_OP_SREM] = { "srem", dt_dis_log }, + [DIF_OP_UREM] = { "urem", dt_dis_log }, + [DIF_OP_NOT] = { "not", dt_dis_r1rd }, + [DIF_OP_MOV] = { "mov", dt_dis_r1rd }, + [DIF_OP_CMP] = { "cmp", dt_dis_cmp }, + [DIF_OP_TST] = { "tst", dt_dis_tst }, + [DIF_OP_BA] = { "ba", dt_dis_branch }, + [DIF_OP_BE] = { "be", dt_dis_branch }, + [DIF_OP_BNE] = { "bne", dt_dis_branch }, + [DIF_OP_BG] = { "bg", dt_dis_branch }, + [DIF_OP_BGU] = { "bgu", dt_dis_branch }, + [DIF_OP_BGE] = { "bge", dt_dis_branch }, + [DIF_OP_BGEU] = { "bgeu", dt_dis_branch }, + [DIF_OP_BL] = { "bl", dt_dis_branch }, + [DIF_OP_BLU] = { "blu", dt_dis_branch }, + [DIF_OP_BLE] = { "ble", dt_dis_branch }, + [DIF_OP_BLEU] = { "bleu", dt_dis_branch }, + [DIF_OP_LDSB] = { "ldsb", dt_dis_load }, + [DIF_OP_LDSH] = { "ldsh", dt_dis_load }, + [DIF_OP_LDSW] = { "ldsw", dt_dis_load }, + [DIF_OP_LDUB] = { "ldub", dt_dis_load }, + [DIF_OP_LDUH] = { "lduh", dt_dis_load }, + [DIF_OP_LDUW] = { "lduw", dt_dis_load }, + [DIF_OP_LDX] = { "ldx", dt_dis_load }, + [DIF_OP_RET] = { "ret", dt_dis_ret }, + [DIF_OP_NOP] = { "nop", dt_dis_str }, + [DIF_OP_SETX] = { "setx", dt_dis_setx }, + [DIF_OP_SETS] = { "sets", dt_dis_sets }, + [DIF_OP_SCMP] = { "scmp", dt_dis_cmp }, + [DIF_OP_LDGA] = { "ldga", dt_dis_lda }, + [DIF_OP_LDGS] = { "ldgs", dt_dis_ldv }, + [DIF_OP_STGS] = { "stgs", dt_dis_stv }, + [DIF_OP_LDTA] = { "ldta", dt_dis_lda }, + [DIF_OP_LDTS] = { "ldts", dt_dis_ldv }, + [DIF_OP_STTS] = { "stts", dt_dis_stv }, + [DIF_OP_SRA] = { "sra", dt_dis_log }, + [DIF_OP_CALL] = { "call", dt_dis_call }, + [DIF_OP_PUSHTR] = { "pushtr", dt_dis_pushts }, + [DIF_OP_PUSHTV] = { "pushtv", dt_dis_pushts }, + [DIF_OP_POPTS] = { "popts", dt_dis_str }, + [DIF_OP_FLUSHTS] = { "flushts", dt_dis_str }, + [DIF_OP_LDGAA] = { "ldgaa", dt_dis_ldv }, + [DIF_OP_LDTAA] = { "ldtaa", dt_dis_ldv }, + [DIF_OP_STGAA] = { "stgaa", dt_dis_stv }, + [DIF_OP_STTAA] = { "sttaa", dt_dis_stv }, + [DIF_OP_LDLS] = { "ldls", dt_dis_ldv }, + [DIF_OP_STLS] = { "stls", dt_dis_stv }, + [DIF_OP_ALLOCS] = { "allocs", dt_dis_r1rd }, + [DIF_OP_COPYS] = { "copys", dt_dis_log }, + [DIF_OP_STB] = { "stb", dt_dis_store }, + [DIF_OP_STH] = { "sth", dt_dis_store }, + [DIF_OP_STW] = { "stw", dt_dis_store }, + [DIF_OP_STX] = { "stx", dt_dis_store }, + [DIF_OP_ULDSB] = { "uldsb", dt_dis_load }, + [DIF_OP_ULDSH] = { "uldsh", dt_dis_load }, + [DIF_OP_ULDSW] = { "uldsw", dt_dis_load }, + [DIF_OP_ULDUB] = { "uldub", dt_dis_load }, + [DIF_OP_ULDUH] = { "ulduh", dt_dis_load }, + [DIF_OP_ULDUW] = { "ulduw", dt_dis_load }, + [DIF_OP_ULDX] = { "uldx", dt_dis_load }, + [DIF_OP_RLDSB] = { "rldsb", dt_dis_load }, + [DIF_OP_RLDSH] = { "rldsh", dt_dis_load }, + [DIF_OP_RLDSW] = { "rldsw", dt_dis_load }, + [DIF_OP_RLDUB] = { "rldub", dt_dis_load }, + [DIF_OP_RLDUH] = { "rlduh", dt_dis_load }, + [DIF_OP_RLDUW] = { "rlduw", dt_dis_load }, + [DIF_OP_RLDX] = { "rldx", dt_dis_load }, + [DIF_OP_XLATE] = { "xlate", dt_dis_xlate }, + [DIF_OP_XLARG] = { "xlarg", dt_dis_xlate }, }; const struct opent *op; From nobody Wed Jan 29 02:21:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjQrZ01dYz5lZyC; Wed, 29 Jan 2025 02:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjQrY5Wnfz3rRV; Wed, 29 Jan 2025 02:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738117293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dnitiPxHvSuXh4N87q1vnsMaub4HD4TJ7uQwkLlXSPI=; b=N6zWS8yG5EfJfbJr2hKbceg2dk3xSHtze5MXMXsFA/m76ElwRdOQ1463Z99c5vg0aEI3tM y4C80NF4UKwT6F1Imd4UP8AgdNIsL5sbxtboICp/jInx1iJhp+t4n4GR2MUWl0hUB1L90E OKITVsHA/rPzOnqfFQhuyqYMRxLtONyCe3dL9jpzWod0WFqzILlhYCjUW2rZXhPrv+HL0j EB2TE72tBUFDXoCk+d+GrH92Po0B/qGYZy5hJapTmDuaZ80+jzR5OYAWr4aaV6PppmGZZx Y3OUDtUiKFpx8/UjvN6i0X372k5SZ2z1qGs0s4QOs5vXfpQ3RwZsNbjvfNqaCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738117293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dnitiPxHvSuXh4N87q1vnsMaub4HD4TJ7uQwkLlXSPI=; b=s4JIb/kFbN+HWEAW2mbyAB0xNJEMlPiN0punrs7itA7aywJPyjHXm5y/1VgtWfQINTnyCh JADHdu/G3RmZo18SwR9ZU3COokrmA3UIgFCtOOONTB76YJDyAIq2JNd1gV3mvVvUmNxKv7 AE8BiOE2RtHwRHGefYXyEDycuzW9zmOlHW0hQBxCKY6DmV6kHcyDFemWJHNzMWloFq2zbL uhjKNYzbCtOS0fTymgyOx3at90ri6LYzuVkqqWhV9Uyt7FIEVIz+HwXXOlFLhzlD079DlB eAUt8fpNqdoggz3D7xHy+eADEc1rQ9B0MKkh+svw1k2QWr05psYW2/oHCKM/qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738117293; a=rsa-sha256; cv=none; b=oSEjh+8+mW6n/uW3qxTkDLRGn4vOnOtQCY4z5cAUniwnGLeDX39SmajnROMeWFqXllIFIE Pe7Ytn+TV/wgAO1Vh1/QUWf7JncLAHS/4VQh6U/+ThfbHtuOuLEFt2Dil+OBPQQAkYRhuz 9z+/tS/LeHjnsFy+xj4Dho/POd5CFKfaWxAyFs2yWGKFmdA0pyPJKE1brVUC93hV0MgzwC 9b8efEvipgFMdBLw6/zpu5C9A6W1BTo/sN2SS14NfRX6M58qDHs1Igxn798c/Vl//60dvW 1wKmYws/Mxlx9vBwBNX1dhiSm7J8JCpmYGL5SSPbvPYQAZnsQpwHwDXwBT0bSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YjQrY4s3dzj9D; Wed, 29 Jan 2025 02:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50T2LXUB006292; Wed, 29 Jan 2025 02:21:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50T2LXRS006289; Wed, 29 Jan 2025 02:21:33 GMT (envelope-from git) Date: Wed, 29 Jan 2025 02:21:33 GMT Message-Id: <202501290221.50T2LXRS006289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 70c067062217 - main - dtrace/arm64: Simplify dtrace_getarg() slightly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70c067062217a5295ed321427b91cfd857c18b77 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=70c067062217a5295ed321427b91cfd857c18b77 commit 70c067062217a5295ed321427b91cfd857c18b77 Author: Mark Johnston AuthorDate: 2025-01-29 01:05:03 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 01:05:03 +0000 dtrace/arm64: Simplify dtrace_getarg() slightly The use of memcpy here is redundant, and also incorrect since memcpy() might be instrumented by fbt or kinst. dtrace_bcopy() exists, but we don't need it. MFC after: 2 weeks Sponsored by: Innovate UK --- sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c index ff0e068006bd..3e36004c6f0d 100644 --- a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c @@ -256,7 +256,6 @@ dtrace_getarg(int arg, int aframes __unused) return (tf->tf_x[arg]); } else { uintptr_t p; - uint64_t val; p = (tf->tf_sp + (arg - 8) * sizeof(uint64_t)); if ((p & 7) != 0) { @@ -269,8 +268,7 @@ dtrace_getarg(int arg, int aframes __unused) cpu_core[curcpu].cpuc_dtrace_illval = p; return (0); } - memcpy(&val, (void *)p, sizeof(uint64_t)); - return (val); + return (p); } } From nobody Wed Jan 29 02:21:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjQrb0nZsz5lZyH; Wed, 29 Jan 2025 02:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjQrZ5hyjz3rhM; Wed, 29 Jan 2025 02:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738117294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UvnlinbofBgluhFHTzdqPD/ofBB3y4u56wXVqBwNoPQ=; b=x44gsaMZ8NXNDFcWM24+06mTc7UkjG7d+s2lYdNya2R7GGo+7sBfmW3iCPNJXi4aoKa2G/ c1+GpvIZQox+PW4D4ThOtrzinI+VFDxt4Swzwj6OqjSfBTh2J4v8s6yyF4eChwKcj51/X3 komPFkFbn9jGCCnGQRTvCuwFRq5SQouF+L1ex3Nxv8/Poia7vmf5zEbNIIwRhrhkxJ4LyT MNUssJanqi1s+je6DjcQA9Aj6q6n/kj1k2MvQSlejKl68zjs7O1O/sweG/J4sl2nQBcMPk v0Uh3unE6qgmQy0d4zAIFAUQjlunVyJl2ZQUSYDSboVw498OPIL4XvHg7CIK+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738117294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UvnlinbofBgluhFHTzdqPD/ofBB3y4u56wXVqBwNoPQ=; b=bK9RdqF7uILdCqrrDdW95B7qME1m3fql1uxI20BvVd3snHwRyAGQ3ltdpHyF11/BWA6MLU oM/Hf/2Gg0k8VH01s2w34rFvYSo1Vc/pnfkVXlo7kUMj1dhhtXWWE2VPEWiIJMK8uE3PTc RedWd+wUp8Ai/RXQjqJHFS8kjGn8q76bo8gGZpPIwMmgBNA+4zj27kJ8nmx6NNMyLkZM0G DSPZgqreGXh+k/K48b/aQ/+cWnufTaprJkqXRYnGv8DtTd3eRGyOp5X5tWXufQ4Uig9YM8 c8JkhBQtmFMVhjz3VmVLniUKyJEmQef+Kmdx+C3sIqFCT0C3LAkTqvukON/Z5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738117294; a=rsa-sha256; cv=none; b=eiK++BHL+NtQTFNDqF2FkDtnXZHeeJF4886uDOoaK3j6FQZw2tY3PfZtLCWbZTO/9gUKi1 PsW2oEJy5l+lkghXHsMikFOvHqeqaahWUR0P4orZgWkIbG90WFcQcQWDLMxFVx2EqrrxTH x9mriTEUwnHxsW5ksER6ADVWl95x9WkxuxwnYncwQFvcxy0NrWmbbXard/A8tzqYEZZ/PO 1BIMh5CiR0o11ei6/7Q2pE+daTURy+J9YvF14tEiKeZddF4A1jhZxeHp4SkpgPpLFPhrU5 tTcAeAPoigQH1bcKRS0F/pR6NGWwnp414aCjY502mHF/UkN1kBor7Iyruwfebg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YjQrZ577LzhNx; Wed, 29 Jan 2025 02:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50T2LYkm006404; Wed, 29 Jan 2025 02:21:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50T2LYFo006389; Wed, 29 Jan 2025 02:21:34 GMT (envelope-from git) Date: Wed, 29 Jan 2025 02:21:34 GMT Message-Id: <202501290221.50T2LYFo006389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4da070ce6c01 - main - dtrace/arm64: Fix enumeration of FBT return probes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4da070ce6c015a994ec4ecf3d31ee94810ea19f1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4da070ce6c015a994ec4ecf3d31ee94810ea19f1 commit 4da070ce6c015a994ec4ecf3d31ee94810ea19f1 Author: Mark Johnston AuthorDate: 2025-01-29 02:03:02 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 02:03:02 +0000 dtrace/arm64: Fix enumeration of FBT return probes On arm64, the FBT provider treats tail calls as return probes. Ignoring the question of whether this is really correct, the implementation is wrong: instr is a pointer to uint32_t, so the removed multiplication by the instruction size is wrong. As a result, FBT would create return probes for intra-function branches. MFC after: 2 weeks Sponsored by: Innovate UK --- sys/cddl/dev/fbt/aarch64/fbt_isa.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c index 4f6d28c2f32b..ffe2f37a6d16 100644 --- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c +++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c @@ -177,8 +177,7 @@ again: break; else if ((*instr & B_MASK) == B_INSTR) { offs = (*instr & B_DATA_MASK); - offs *= 4; - target = (instr + offs); + target = instr + offs; start = (uint32_t *)symval->value; if (target >= limit || target < start) break; From nobody Wed Jan 29 02:55:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjRbN2rYkz5ldgK; Wed, 29 Jan 2025 02:55:12 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjRbN2DvGz3wRT; Wed, 29 Jan 2025 02:55:12 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738119312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WedJBrUYZ9CkdlEI7/CYZgPGvzr2uH9XLrddH8h5fnk=; b=CYvJ0Vaz9L4YQt9Kfu/GoZttVCLpIm6piQKXUCg7LA4yydUTOe0bEx88/evtMEyhi+dHqc 3MsBabBxACpnwxkNx3DJwvEuaXR+iEDtSI+JLM4+JniOSRZ3aAFLAu6QL9Rru5WjnVuw5e 4Jpp46vc2peId1Z2XRVr9aqCL/ZL2s4NbQRobUoYgZ9fVeugvTiTHfJxy+ZA6dKGWjdDRF DUC4fqIWENBHsRgSCSfY+KJToSjuppwoR4zGBqYvX/jtv590Jte8ZUe7n43rcRE3E5nPGW Bt8nV9OW4qvOzO5Rjl6aCOE1SjS8IqgASumgLq4eDkBJQLyLGKXyhIvom8XUfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738119312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WedJBrUYZ9CkdlEI7/CYZgPGvzr2uH9XLrddH8h5fnk=; b=fBdEj7FTZOTAo1WrilDOI2MoW99DqCJAhcMFOyEIsClBnPCn6FJ3dGUo4VnZVemTOxvNrb Gz/3BjqabmKvvYtQ2Md8F5FRxMr+pBPM2tvwgEzQJC7PRMw7uMQ4U+niYmYQqTw2pCwKfm cSvEin7jK/sZb9s7O/dqoLviu+TRLxqHwZNNNMTuYaFzyq0Z3Yz8r950oQZ0ovZR+WonA9 TqyBMp3hbdltwSMUnXpsS5I5vOpkSF0D+sfgwa8OCN0xlbYb6U50ViaCt8/XJcPz3Edb0s 4LV6bvk6gzm3ekeTLjzuzZlQDV6YbFtnnZz5Yy1P6lYNAv7gds7G8vKidPf1Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738119312; a=rsa-sha256; cv=none; b=ALSyK/Yog5zZwJRBV0giw7fPS0RjMEYJU3YgFN1JnpYGQ0ivep4f6i3/Q8Sq8ED+mKzDdz PXtVtySk6j6S2qgYTXkW5YJCha/9sjgXIco/VVnyqNS3XH2HsS2idRnRFwuNpN0pDNxWQB PIbq35y/S3fc2KyviPGaSAzw77Cw/0SZIQbiZuoikKOLYgnacVMB3gbn+IeqJFewmV76tP iY1jGfdzNbQKN3Y5V2qDRJcFrSHbW7ydVLXF12e9pZiMYDRdTickFzp5nSP4lLChyoy0uG 7yvK4n8oyQ4buwvfqRrlmlEFcZMi6cqYPfcdlA1enXB2OBbA8TI3ZjtHMyggxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: by freefall.freebsd.org (Postfix, from userid 1033) id 255011DEB0; Wed, 29 Jan 2025 02:55:12 +0000 (UTC) Date: Wed, 29 Jan 2025 02:55:12 +0000 From: Alexey Dokuchaev To: Dimitry Andric Cc: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: c3450ad127e9 - main - clang: re-downgrade implicit int/function declarations to warning only Message-ID: References: <202306222111.35MLBAqB066211@gitrepo.freebsd.org> <90D8C9F1-0634-44E5-B5B5-20455A91E042@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <90D8C9F1-0634-44E5-B5B5-20455A91E042@FreeBSD.org> On Wed, Jan 29, 2025 at 12:20:51AM +0100, Dimitry Andric wrote: > On 28 Jan 2025, at 19:32, Jessica Clarke wrote: > > On 22 Jun 2023, at 22:11, Dimitry Andric wrote: > >> > >> clang: re-downgrade implicit int/function declarations to warning only > >> > >> [...] > >> As noted in the upstream discussion, there are many programs that fail > >> to configure or build correctly, if these warnings are turned into > >> errors by default. > >> > >> Note that most affected programs in ports are relatively old, and are > >> unlikely to be fixed by actually adjusting their declarations, but by > >> compiling with -std=gnu89, which downgrades the errors back to warning > >> again. Lots of tedious work for very little gain. > > > > This remains as a downstream divergence 1.5 years later, but I do not > > think we should be carrying this indefinitely. Software needs to build > > with upstream LLVM, and the fact that many ports do not is now biting > > us for CheriBSD where we use our own external toolchain that does not > > have such a diff. In my opinion this should be reverted for FreeBSD 15 > > and it's long time for ports people to step up or have the broken ports > > removed; we can't keep going on like this with abandonware holding back > > forward progress. > > While I agree, at the least a full exp-run should be done, and even then > you can't be entirely sure if ports that build are built the same as > before, for example due to bad configure tests. So this is potentially a > massive undertaking. Can we actually do an exp-run to identify affected ports and at least get the idea of the fallout size? I've recently hunted one such subtle bug exposed by GCC 14 so yeah I fear there'd be a lot, but we need to start with something. I presume fixing it won't be particularly hard, just tedious. ./danfe From nobody Wed Jan 29 03:06:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjRrX0rJBz5lfN8 for ; Wed, 29 Jan 2025 03:06:36 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjRrW3Df5z3xVq for ; Wed, 29 Jan 2025 03:06:35 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-43675b1155bso72285365e9.2 for ; Tue, 28 Jan 2025 19:06:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738119993; x=1738724793; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3RzDc33GWzrpaqnyXzh09kUNggm+6qi0++3/oUOZrco=; b=cFE4qJORkG87b+JfXpL1oh+BJ4dGZMPeEjkJsTJGppUnfasYYACifwaa+eSEq8bMzp +sd8r8qZQ1Zi9Mx+7cvBmJ54OeIun30IfFvfPcWua27Do2gZn0CuC3BVcSHubGZo3LCK vXXWQ0lc8mBNFDFUHV00X10PAhuzBYi9QRC8ZEutOfCDl3DkUAc/+K7mwNiBW34EDJHd 1U7qFjf0uIHdu58GyrftwQSNp0+frUi/aX41vyStTwKJks6KlwY1NYeZACsHMNyn03Jb /veG8loX9eR2QiIEAjxTGSWbBdhjEhE8SiY8YjVLEUbELFaoJZX/AdF5Y1sz78pg7YRg zZnw== X-Forwarded-Encrypted: i=1; AJvYcCXJci0x2zpHWFMQx2WxYHUb2haA8h8w/PB6OsHCwCCu39CCps7ESmn22tbSvBGcaR22lJhCAlSxdHkydCLJe7QUwRUeCQ==@freebsd.org X-Gm-Message-State: AOJu0YzOhx+xeFgeXsM3IM1zRKHRKHZKmMUw4PiGM+eNd/4AEv0sZucD MoAIjKgQ4lvaJtrdhpowESjGNf3Qe7yOSB0xwEjEpOwkDkMDjPm3VJLJ16yhmzmovi73aj19bmI 3 X-Gm-Gg: ASbGnct5hnTNxyuZh0gN7LeWh2XfWc+nJuZ9Uyt77zvn02jbZBtNi94JdRvJDZaYua5 4mwPkomUM7pjusG9msxG5lqrxc+WI/+MmB6sHS2M8/w013f3SsY+4/uqn94e62rIKiJG1ANb2Yd g3H3Mnyn2MrumOwkcVQOIH6MeR6BKnetSIUcmbVBq01EH+xNIRw3v3a0w+V06nuGrK0QafLhaka qzOgdfWZvwDegLwLpAwRBhRRNr37kyMnRjb53bULR24pigkLDsoWP48WQvHsNbA432VAHyzV8AY EayGIOKa+HuliirrVXZLKWyIhPSAHw== X-Google-Smtp-Source: AGHT+IHMdtAQ4SAUBWsJCjsFYXcIt1eWB2rq3HsipJQTtZxs6gec20JAeUeuqpVhnifkK38qBn4QnQ== X-Received: by 2002:a5d:54c2:0:b0:38a:88e2:e6aa with SMTP id ffacd0b85a97d-38c51960019mr831401f8f.29.1738119992752; Tue, 28 Jan 2025 19:06:32 -0800 (PST) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c2a17633dsm15893582f8f.15.2025.01.28.19.06.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jan 2025 19:06:31 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.300.87.4.3\)) Subject: Re: git: 70c067062217 - main - dtrace/arm64: Simplify dtrace_getarg() slightly From: Jessica Clarke In-Reply-To: <202501290221.50T2LXRS006289@gitrepo.freebsd.org> Date: Wed, 29 Jan 2025 03:06:20 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <8086E5AF-1350-47D8-9010-6DFFFF7FA8D3@freebsd.org> References: <202501290221.50T2LXRS006289@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3826.300.87.4.3) X-Rspamd-Queue-Id: 4YjRrW3Df5z3xVq X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 29 Jan 2025, at 02:21, Mark Johnston wrote: >=20 > The branch main has been updated by markj: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D70c067062217a5295ed321427b91cfd8= 57c18b77 >=20 > commit 70c067062217a5295ed321427b91cfd857c18b77 > Author: Mark Johnston > AuthorDate: 2025-01-29 01:05:03 +0000 > Commit: Mark Johnston > CommitDate: 2025-01-29 01:05:03 +0000 >=20 > dtrace/arm64: Simplify dtrace_getarg() slightly >=20 > The use of memcpy here is redundant, and also incorrect since = memcpy() > might be instrumented by fbt or kinst. dtrace_bcopy() exists, but = we > don't need it. >=20 > MFC after: 2 weeks > Sponsored by: Innovate UK > --- > sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) >=20 > diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c = b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c > index ff0e068006bd..3e36004c6f0d 100644 > --- a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c > +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c > @@ -256,7 +256,6 @@ dtrace_getarg(int arg, int aframes __unused) > return (tf->tf_x[arg]); > } else { > uintptr_t p; > - uint64_t val; >=20 > p =3D (tf->tf_sp + (arg - 8) * sizeof(uint64_t)); > if ((p & 7) !=3D 0) { > @@ -269,8 +268,7 @@ dtrace_getarg(int arg, int aframes __unused) > cpu_core[curcpu].cpuc_dtrace_illval =3D p; > return (0); > } > - memcpy(&val, (void *)p, sizeof(uint64_t)); > - return (val); > + return (p); Doesn=E2=80=99t this change from dereferencing p to returning it? Surely = p should be a uint64_t * that is dereferenced? Jess From nobody Wed Jan 29 03:13:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjS0B20rLz5lgBh; Wed, 29 Jan 2025 03:13: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 4YjS0B1X46z40Mc; Wed, 29 Jan 2025 03:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738120394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsXdT0HLz8VSgAWmCsIpxhx3Th2LLhK1ffpbtS/mFgk=; b=CvgnqtPxT40a3eZK95J5+XojeQfHr2SM+hE5+HXdwR3hhsdl5AoKxVR4Gj9+yHu/rU2Qdy ZSeviwpL21g68s9saFJrakGV5BqjE0gWC26A1IVOJ2s9G/7cv8wHFEQhV73J7yldjPx5dN DxDrhGKGeROvOU+3mAdRmPA8jR5ysxGTxARp1d5Ii9hUv1wA/1QW3m18lFuXaQljAWIzx7 D4PQG+9k69Au23BujwSik9AF82HoUhW7+slfthxta9M3wUfCjGRewV6uyQUAymduEIXLFB IGnN3YCNGV/qG5kSHoi298qIntkqMgXB/q3PexhM+eF6v2gNElBpk2OxodqHTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738120394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsXdT0HLz8VSgAWmCsIpxhx3Th2LLhK1ffpbtS/mFgk=; b=P9HEOGH5/Qc/Jaai/1kkEEojkmF4B/a9Mqg+67GWYIstPy6hEMpqInrIW372EJCcDXgGHD BOUFRb8q4MQ1B3ixl1vlh1+Y9ujtAMVfxPUoKe1P1Mm9WfaFl5biyq1sK0BM7ylYFaLtLC s9I7/ozr6KxbR9br3/1OwzA9RymNgTuxtyPZVBh6bbtW/DenSPWFKvK6yANOUapZg0uZ2k 3rV/vRjOpPQ6d5ExDc2f8yvRThR78GmxrpGkFjJEUKmWADtUjhRgXz0EO5unpcDfemIPZO fQiSjOTOsQL8drcD5Dk6Kp1qeDILkFRhShDtgQYvuyuTuq8oyQc922q8IWaT5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738120394; a=rsa-sha256; cv=none; b=nAfDkX0Z8O7WYGXnkTfcEGw6fr36EePtYJuxxJBOLOVtknhGthsGpshNl6FF/K/Xm57is5 WXasw9w6AisrAsw27l+AoZroWitztueqa7hXrScqM7spJ/s/v+ejzBVKU4E22W4r5CPT2F NJcAIMY+EVuFSrMTek3ozVxoZc4Ad7/FhtW2x2K4ptjQZzxUjUJdez7JPCtajrF7tBANIK l4+D8uHUuQNV02JXuwdYRGqvolMonoG6d603iyaVtCMCgoE2yTQDtL0OtWfEO2rSqZEJoQ 2SBoM9oCL3xa9wbJJGWvpLrUUVwsEalOVcDQ4e43kUjTuqChYFzOFQDLBezZig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YjS0B0zgTzkjn; Wed, 29 Jan 2025 03:13: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 50T3DEqB005811; Wed, 29 Jan 2025 03:13:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50T3DEAD005808; Wed, 29 Jan 2025 03:13:14 GMT (envelope-from git) Date: Wed, 29 Jan 2025 03:13:14 GMT Message-Id: <202501290313.50T3DEAD005808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 94fb5ab9043c - main - Revert "dtrace/arm64: Simplify dtrace_getarg() slightly" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94fb5ab9043cbe6188cf30f51f7e85739ba41503 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=94fb5ab9043cbe6188cf30f51f7e85739ba41503 commit 94fb5ab9043cbe6188cf30f51f7e85739ba41503 Author: Mark Johnston AuthorDate: 2025-01-29 03:11:48 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 03:12:46 +0000 Revert "dtrace/arm64: Simplify dtrace_getarg() slightly" The change is clearly wrong as it removes a dereference of the pointer into the stack. Just revert for now. This reverts commit 70c067062217a5295ed321427b91cfd857c18b77. Reported by: jrtc27 --- sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c index 3e36004c6f0d..ff0e068006bd 100644 --- a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c @@ -256,6 +256,7 @@ dtrace_getarg(int arg, int aframes __unused) return (tf->tf_x[arg]); } else { uintptr_t p; + uint64_t val; p = (tf->tf_sp + (arg - 8) * sizeof(uint64_t)); if ((p & 7) != 0) { @@ -268,7 +269,8 @@ dtrace_getarg(int arg, int aframes __unused) cpu_core[curcpu].cpuc_dtrace_illval = p; return (0); } - return (p); + memcpy(&val, (void *)p, sizeof(uint64_t)); + return (val); } } From nobody Wed Jan 29 03:14:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjS1t6N46z5lgQs; Wed, 29 Jan 2025 03:14:42 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjS1t3Wvzz40S0; Wed, 29 Jan 2025 03:14:42 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x829.google.com with SMTP id d75a77b69052e-467725245a2so61832861cf.3; Tue, 28 Jan 2025 19:14:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738120480; x=1738725280; darn=freebsd.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=ztLVgZSIQS9LvYUuh73yQNmbEcy+aM7QKfTN8zFkJI0=; b=MEYc145131pzJlps4KmtGQx8SSzbyuE25RNN1NirwkNbP8Tn3feB2QS7spoxr3KKqF BfD6LbgSiwxj9iMSevKLrqJioyhPSVkDwOpx7WMuW/NfEEz2/mbZMH+XmFKrySmvy0MT D/lc4GrBYcY6Pip+T0jXLB10p6APakra7SfynITgvhCW3WnJTPRSP6JTZ6T6HHnFxQg5 fmMj+TBB+ud9UBMjg6Wmwow+yhxzB9E/ifT7pT/GW2SdfsxCa07yDeVLKcbyueeN3wRS gogSPBDOBcyqH0/rGxkPKZ0Qu4hiaKjaO7Q+AUCk09qhhfis/YpyYruc8+kovqVSO582 dYnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738120480; x=1738725280; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ztLVgZSIQS9LvYUuh73yQNmbEcy+aM7QKfTN8zFkJI0=; b=Uz4XEu4iJ8/BZJz79e9Jshz3G3+9Pg01bmGpB2li8GPyLWXywbi6fnSeLsmpTUqIk7 RT5uIIaayDrikIH5fZtvqgdVpvzcs1a0JMyYXZpRjEfP2O/xJ9hQdIPKXwV+ijmFwNws PKQ8Hbcuh45kyiy/Tg7HC7ikujjtpdWVHoHShxqlxh1iSOkpgQRy7bHgJ1EMZW5Kp/AL zXhHRCgJaRsid6Vf4ShAL/4LMTtGLs5TRJi8d6+UzlR4w4c0kcMONl5QlmCMIILHeO4a WwkVc434NJF55iheWKNo9nPKtV7v6Hy/PQDAV7e1u7bBFykcbrSZgkNQaUdsUwUUquo2 jtZw== X-Forwarded-Encrypted: i=1; AJvYcCUjkyRXd5/qfkyrMw6bVzga4Bs/s38AhJIXgn/RQ2lVkKEZnNg5kwG1QRqRkZ4F0mmqeuShXtrwJVFF5zT1mdHSGaOp@freebsd.org, AJvYcCVi1aMNmF8be+0B/lJwX7t2cvufkmXauU1xPUB2Wfv0JEZzJaUs7YDcUAGQfMSSJ113VLDUrLtFret8KXn9Ev4xxPUx4eI=@freebsd.org X-Gm-Message-State: AOJu0Ywz808LvCwPRzAD9gkk+w3m+oX4qeZZaUgEIjDyjpvEWdooec32 Az8Wwvh1Ybk39aBuReWb2fNx0dq1u5hOlPA7pJMV0zB/ZBYl8GfoZNQQpw== X-Gm-Gg: ASbGncsnX1vXPq7ZEF7csTd7GtIkyi6za7RXpHnPsfdWprbjIAqVtTEhItjvI8JHxSE J0V+M/4qRqlHnOLjfFXYHidv+gAftbZ6cvCXcJ6wGWpqSGOIFFJ5ethKPUd4PYT+bcNwY1c9iqv m3L+9N8T4GZ7t9PUYIL6JLZauZewZaXVBbZi4lskiDtFxbpCKdg5O1Tmty+bP0u92pOyS2HEsoT 9UsoIWtxzmlubJ3zgJulFymwE3rQb/q7S0bB20xgTOjd3eN1QbOBU56AOYM5+mtpppBbaQuy8qF zqwf1Epf78LdCywYqhMySRFWnnVn6lFog5TTWgj2 X-Google-Smtp-Source: AGHT+IEeDAwZujCoIeUoe3fEYbpuFdcs64CjlcsAQg9HvayRlZ6qMlpC13/rCTNVqRyU14M3nmzc1g== X-Received: by 2002:a05:6214:4188:b0:6d8:8a8f:75b0 with SMTP id 6a1803df08f44-6e243bb8863mr28233506d6.14.1738120480299; Tue, 28 Jan 2025 19:14:40 -0800 (PST) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e2057a890fsm51304076d6.88.2025.01.28.19.14.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2025 19:14:38 -0800 (PST) Date: Tue, 28 Jan 2025 22:14:36 -0500 From: Mark Johnston To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 70c067062217 - main - dtrace/arm64: Simplify dtrace_getarg() slightly Message-ID: References: <202501290221.50T2LXRS006289@gitrepo.freebsd.org> <8086E5AF-1350-47D8-9010-6DFFFF7FA8D3@freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <8086E5AF-1350-47D8-9010-6DFFFF7FA8D3@freebsd.org> X-Rspamd-Queue-Id: 4YjS1t3Wvzz40S0 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] On Wed, Jan 29, 2025 at 03:06:20AM +0000, Jessica Clarke wrote: > On 29 Jan 2025, at 02:21, Mark Johnston wrote: > > > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=70c067062217a5295ed321427b91cfd857c18b77 > > > > commit 70c067062217a5295ed321427b91cfd857c18b77 > > Author: Mark Johnston > > AuthorDate: 2025-01-29 01:05:03 +0000 > > Commit: Mark Johnston > > CommitDate: 2025-01-29 01:05:03 +0000 > > > > dtrace/arm64: Simplify dtrace_getarg() slightly > > > > The use of memcpy here is redundant, and also incorrect since memcpy() > > might be instrumented by fbt or kinst. dtrace_bcopy() exists, but we > > don't need it. > > > > MFC after: 2 weeks > > Sponsored by: Innovate UK > > --- > > sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 4 +--- > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c > > index ff0e068006bd..3e36004c6f0d 100644 > > --- a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c > > +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c > > @@ -256,7 +256,6 @@ dtrace_getarg(int arg, int aframes __unused) > > return (tf->tf_x[arg]); > > } else { > > uintptr_t p; > > - uint64_t val; > > > > p = (tf->tf_sp + (arg - 8) * sizeof(uint64_t)); > > if ((p & 7) != 0) { > > @@ -269,8 +268,7 @@ dtrace_getarg(int arg, int aframes __unused) > > cpu_core[curcpu].cpuc_dtrace_illval = p; > > return (0); > > } > > - memcpy(&val, (void *)p, sizeof(uint64_t)); > > - return (val); > > + return (p); > > Doesn’t this change from dereferencing p to returning it? Surely p > should be a uint64_t * that is dereferenced? Yes, thank you, that was a stupid mistake on my part. I reverted it for now and will fix the problem properly tomorrow. From nobody Wed Jan 29 03:25:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjSGT6l67z5lwXh; Wed, 29 Jan 2025 03:25:37 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjSGT6FhJz4230; Wed, 29 Jan 2025 03:25:37 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738121137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=toaGgF+7Gv5LWUScTlaWV0XoN4LsBufoVWztbfEihOs=; b=Cda5sQhpp3vQyvbHDbotgvi2D2nazGD+/n8IErvtDeG+1mgcdbnIK2CjH0nK5lOXgruVts BjO+xQLaIWcwbL4anyEz530awTBJEffe5jQ8MTsEBs4kC2/R1k7RpkLyyUSMdrxnafXOdv uqIVvz700Azzb+4xWptQ6Pfn7RqD2yZDCwQtVdK869IitXsGHTGR0EyK357W3EbqEM6tYi FMm04x1kmn+jwN+EB10E/9waobcgdsPrMBU1YXpKWtDTcSQ2Bso58rmd89Op7fmRfBM7R3 4MdzDpRONKOTuzJHsmPfS7caOxRmjed2BNQJHXf9I5V4AJzgcKTsqRnlCiqWFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738121137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=toaGgF+7Gv5LWUScTlaWV0XoN4LsBufoVWztbfEihOs=; b=Jx9PPgKpUyLBjf0u7Kf4S1zc4fxXEef9i/MW3w5GZyAfKgQZ66mhwQGS4h4QVdMv4QNMvT uo4y0ktPphTKtstXocQ4k7JJdrXL0slQyGCUQre5SIYIlE54UDxWjliz5NS4QCLWLOuy9u 2YzbfUu/CipPEDsYURy8SWYcv3cepDiOSCFZtF9FNZxFWd2roO8pyyxukaT2YCuucrjXI9 NR1mdb/nIjcu9Gk/0FAOeuD8ZsasMeVTESFhRaJcg7anTS8IR+ajBW0+hyHsz5R5vVPbIi 1zjGUmPVGuFG9V5WQmcoIJ/be2YAsPONAkC72Pj6YUPsgmqNvkMUfzBJjNwq+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738121137; a=rsa-sha256; cv=none; b=fvKtn67hLcB9LYY0mhdLjHr/mZbxHQIcerKVe0ut33ImxGDF8JZ4mGn2Ja+qsAm56b2xl8 yzSvw4jlk7I1Y4E9RQfYN9UUkT7jfc91Y/EIE1Ul9pK8W22P6Ltdkp+4Bctuh3SfurvNKj Bg74/rPNAYmrJEdoMQ3DngcjuMf3PsK5br4aFI+10O+z0Ouu7nIourQ3cfUPF1NANrwx31 0DBpt5maI6Uk8hWKEKa71tWICM8tPpnPmz7Ucg6lQfcomY1wzi3cgDBZjfAK5mzZ8FKsPF s1FknLn5balZWrPJKRaJgnez8m84rT1i/OnQbTfdkU54KE3yEE6KNhGTW0UaYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: by freefall.freebsd.org (Postfix, from userid 1033) id C07C61EFA0; Wed, 29 Jan 2025 03:25:37 +0000 (UTC) Date: Wed, 29 Jan 2025 03:25:37 +0000 From: Alexey Dokuchaev To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cda74c35cb37 - main - firewire: Add deprecation notice Message-ID: References: <202501231812.50NICZuA014875@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202501231812.50NICZuA014875@gitrepo.freebsd.org> On Thu, Jan 23, 2025 at 06:12:35PM +0000, Ed Maste wrote: > commit cda74c35cb37aa8ecb536aae8d93451eafec15df > > firewire: Add deprecation notice > > This was originally discussed as part of FreeBSD 15 planning, but did > not happen in time. Add the deprecation notice now, with an expectation > that it will be removed before FreeBSD 16. Oh, but why? I use it with one of my external HDD boxen and it works fine. While we rarely see 1394 ports these days on the new computers, adapters are inexpensive and easily available on the market. There are people with various camcorders which support video capture over 1934 and I remember debugging over it was fast and easy to set up with the dcons(4) driver. So, might be reconsider this? If there are some outstanding issues with it like Giant usage, I'll try to come up with some patches (allow for some time as I'm not a seasoned kernel hacker). Thanks, ./danfe From nobody Wed Jan 29 03:36:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YjSWY39v2z5lxVT for ; Wed, 29 Jan 2025 03:36:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjSWX6D6rz4485 for ; Wed, 29 Jan 2025 03:36:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-2ef714374c0so474817a91.0 for ; Tue, 28 Jan 2025 19:36:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1738121815; x=1738726615; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=bHPp6FI5qEpIE9vSkx6YsYWMJfixiwgQhbd0X3ZRpXE=; b=KzZPRY4CbvggitntEUp+6YL5kMD7gYuxKM54IVhUkTy6yOD1eoPQlDKTdUCHhBLsNu DQidpFuRu8iwpDDsA+8DHClW6m6iFsbDG6hDQFS0g2ZFpQMXYAs6sixhvZ3nMZSMAM9u tId83mXEn4Xzowco3W6FoMsQr3e56SBEfcZan2tup1C9OL7vfnDrLGXbdGjce8OEdwO6 1ZhS0reXyfpqDrCW+v1s9h92ZCIrFWCIAjP6Xjh56bMuc43SuzAxbc6gPnonS4byHBf8 mHqlcqtmt0zs3wChdIr7GQf7TqHt81ElZje4ulz4pc/DNpKUfXA3BzeVt6acQSEzxi8U gZFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738121815; x=1738726615; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bHPp6FI5qEpIE9vSkx6YsYWMJfixiwgQhbd0X3ZRpXE=; b=kukom776r4Y57v90rN0sr7U/mfuaivcJksRvVp8TFUusBJ3rQC8HFzTx6YTVXE/9g8 r8KNjz3LtFfiCypUVcobeRidpLgJTMtu8ySlL+7AJtbfHD+iCe5jervISO3Cgh8yA42k wOPgJrC0p2kHdxcL/cNRUuq6Xpb5Ipimoz7yMRAutIMGmnbBZpv5Mpen42Wy7V6+l1Gr YTqOfgyRYdmoVZFUrAzhKeQn//4UbAUdZsMH37mVfph33Ho6WwHz1yBu5seeTjOXZ9Zg MKVcRLEcnaNxqCXliCUYs//8JThPv5SYDlrbwKELWXpXrXMuOesXN4q98PP96ASTaVuB 7opw== X-Forwarded-Encrypted: i=1; AJvYcCXHOFwHxInhoUypdVq8Suhz3LRMi+puCZ5o+5ireh2InoiM6r3Xe9mo4gVDnwo4T0itoK6lh4pDaigwatKsRcmYsGFWaQ==@freebsd.org X-Gm-Message-State: AOJu0YzYbCRsmqqzc8sMEuN2uusobEyJtXYV9n9DQjnQz3wBsCw8ME13 BlTqNtqx3tglaQq3BfaPboXXiuiiSWdRahMtoF9K67N0ddOf94+cBPxr3YR+7a+LoZ2kH/zxpwD PslZpNgQEGC/N0D/RGmkp2G42Ewbpz9hQTfyDYL5P1Sjhfukac6o= X-Gm-Gg: ASbGnctyIGwbio4ae0Kiawjj6osiBSAmRhaXiwKQSYWcvMj2V0al93koFISmo0qpnXK sPdgWywHDHsvSwhFpjv3URhX8Mpzy4SSXRJseaxqSOdhoKxDbhDkMpweHApB3g/d/tkdWqj3V0y UMLJzK9y81fMg30+utDU51SVGerM4= X-Google-Smtp-Source: AGHT+IGb/yQMlUuY492RSiFt1wB1TrPh3p7aV3L6ike2Cad17JAxtI/+jhSS4j55KxC7luUpwscYP3DfXSJrrBRJnRA= X-Received: by 2002:a17:90b:524b:b0:2f2:a974:1e45 with SMTP id 98e67ed59e1d1-2f83a122cc4mr2562951a91.16.1738121815288; Tue, 28 Jan 2025 19:36:55 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202501231812.50NICZuA014875@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 28 Jan 2025 20:36:43 -0700 X-Gm-Features: AWEUYZmwePtQXXNpQRxczjK9301gh283um9u0u9FEPhxVDz_xu23tY6DYQg5tF0 Message-ID: Subject: Re: git: cda74c35cb37 - main - firewire: Add deprecation notice To: Alexey Dokuchaev Cc: Ed Maste , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000608d28062cd005ce" X-Rspamd-Queue-Id: 4YjSWX6D6rz4485 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] --000000000000608d28062cd005ce Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Jan 28, 2025, 8:25=E2=80=AFPM Alexey Dokuchaev = wrote: > On Thu, Jan 23, 2025 at 06:12:35PM +0000, Ed Maste wrote: > > commit cda74c35cb37aa8ecb536aae8d93451eafec15df > > > > firewire: Add deprecation notice > > > > This was originally discussed as part of FreeBSD 15 planning, but did > > not happen in time. Add the deprecation notice now, with an > expectation > > that it will be removed before FreeBSD 16. > > Oh, but why? I use it with one of my external HDD boxen and it works fin= e. > It's Giant locked and we're hoping to clean up the giant havks in CAM. Many have been, so Giant locked sims may or may not work under load. While we rarely see 1394 ports these days on the new computers, adapters > are inexpensive and easily available on the market. There are people wit= h > various camcorders which support video capture over 1934 and I remember > debugging over it was fast and easy to set up with the dcons(4) driver. > > So, might be reconsider this? If there are some outstanding issues with > it like Giant usage, I'll try to come up with some patches (allow for som= e > time as I'm not a seasoned kernel hacker). Thanks, > It'd Giant related. Good luck. Warner ./danfe > --000000000000608d28062cd005ce Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Tue, Jan 28, 2025, 8:25=E2=80= =AFPM Alexey Dokuchaev <danfe@freeb= sd.org> wrote:
On Thu, Jan 2= 3, 2025 at 06:12:35PM +0000, Ed Maste wrote:
> commit cda74c35cb37aa8ecb536aae8d93451eafec15df
>
>=C2=A0 =C2=A0firewire: Add deprecation notice
>
>=C2=A0 =C2=A0This was originally discussed as part of FreeBSD 15 planni= ng, but did
>=C2=A0 =C2=A0not happen in time.=C2=A0 Add the deprecation notice now, = with an expectation
>=C2=A0 =C2=A0that it will be removed before FreeBSD 16.

Oh, but why?=C2=A0 I use it with one of my external HDD boxen and it works = fine.

It's Giant locked and we're hoping to clean up the giant havks= in CAM. Many have been, so Giant locked sims may or may not work under loa= d.

While we rarely see 1394 ports these days on the new computers, adapters are inexpensive and easily available on the market.=C2=A0 There are people = with
various camcorders which support video capture over 1934 and I remember
debugging over it was fast and easy to set up with the dcons(4) driver.

So, might be reconsider this?=C2=A0 =C2=A0If there are some outstanding iss= ues with
it like Giant usage, I'll try to come up with some patches (allow for s= ome
time as I'm not a seasoned kernel hacker).=C2=A0 Thanks,

It'd Giant = related. Good luck.

Warn= er

./danfe
--000000000000608d28062cd005ce-- From nobody Wed Jan 29 09:14:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yjc1B4Wyjz5mQVd; Wed, 29 Jan 2025 09:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yjc1B49knz3qYQ; Wed, 29 Jan 2025 09:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738142078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rsaemSQTcHOWD6R97bHNQbIEN5hoBroeyeOsuW3JGOk=; b=ntzPiQpemFggHuq7up0c/2luYPRtWvFLd+3clHnd6a7DYYAN4qZQLZGB1BIq3jbtGn26zY BagVFTzebcpVlThkNYiDl8oPBjoNFrxruPhAGa+3CIgp7D3LGUCKZuuUy0uRSx/tPki7Nf JlIOhWiYX6oKTsExSQupOQ2KszroTCN+tteBybYLBhKO6ZuN3HgT1G0pl/Rj0q/dPbwVYr HRKhiD96Crxpg47Fv9iuQ5bC5o0rtMMotOIUJzeyINnKXknp0ZJ95bskyglAxLaYdOKBOI Tnm+7kbYogIXBUNIO2B/OVdanRi53Ioi4s2iow24lK1/qN6y5LXruYsZY6YSvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738142078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rsaemSQTcHOWD6R97bHNQbIEN5hoBroeyeOsuW3JGOk=; b=Jyx4PitUl9eWfeUgljGBejUy+dHqEcLWY/ApBBKh1EwvvuSHbzpIbupCmilwvZMMCwm4fB bLmQC+94sIx4PJLtNn1dRgaxU5ZUIwcJx+9muo2uw0VMlA7fRjYwmqzIakaCjinOccCqaI MJ7H+BqonSBdBAlxddEwqrLZWPzgGLUk+jAwc4m5MKPHVw6F5158Ussc0EGTpkWYhmF/xg 2JxC4OOSGArw2p7mfWPtiTFHcTPglzK6RY99WmkbP9Jq63zV5s/MrblX4C8Us22RicPZMQ bVror4Ix8lsnhgZSIBpalHdWiODt/60IVTo1NnWIrxUJ3VsfBUmNo/gxarxL4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738142078; a=rsa-sha256; cv=none; b=bNlsfUcdMaMZ9gZqhIyT4YN5+kOetB28oTbbgtI4puSs/3LJF+KN+j5AOPDQYaXHfvhzbn xLs+jPTKRO7ws+U0sxLfPH7EU4Mvq8dLRRPebNXVVP+e1pzxXmElnMqpct4xjwysO4ex0/ kRQTzyMGJnvxfIjgagvtZqGnqjNgaDSShckQGw8sztQTh2KnxDGKg72O0ZB1vcTppapQHm 0WbiyneJ3B8eRkwc6ZGJktojmCHnFjquZmfzT09xNPia4CT+8zABp1GJOAjwP6iRPxbV5Z Fzts92Ub4+spTuyhWPxTjMEvbDZX8lN/t4/6xYdwt3oF8H9QMrFzcEGYpatT9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yjc1B3b7wzvGb; Wed, 29 Jan 2025 09:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50T9Eco9077542; Wed, 29 Jan 2025 09:14:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50T9EcNn077539; Wed, 29 Jan 2025 09:14:38 GMT (envelope-from git) Date: Wed, 29 Jan 2025 09:14:38 GMT Message-Id: <202501290914.50T9EcNn077539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 0078df5f0258 - main - vm_phys: reduce touching of page->pool fields List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0078df5f025854600595462e56fa95d34e732141 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=0078df5f025854600595462e56fa95d34e732141 commit 0078df5f025854600595462e56fa95d34e732141 Author: Doug Moore AuthorDate: 2025-01-29 09:13:17 +0000 Commit: Doug Moore CommitDate: 2025-01-29 09:13:17 +0000 vm_phys: reduce touching of page->pool fields Change the usage of the pool field in vm_page structs. Currently, every page belongs to a pool, and the pool field identifies that pool, whether the page is allocated or free. With this change, the pool field of the first page of a free block is used by the buddy allocator to identify its pool, but the buddy allocator makes no guarantees about the pool field value for allocated pages. The buddy allocator requires that a pool parameter be passed as part of freeing memory. A function that allocates memory may use the pool field of a page to record what pool to pass as that parameter when the memory is freed, but might not need to do so for every allocated page. Suggested by: alc Reviewed by: markj (previous version) Tested by: pho Differential Revision: https://reviews.freebsd.org/D45409 --- sys/vm/vm_kern.c | 2 +- sys/vm/vm_page.c | 97 ++++++++++++++++++++++-------------------- sys/vm/vm_phys.c | 123 ++++++++++++++++++++++++++++------------------------- sys/vm/vm_phys.h | 6 +-- sys/vm/vm_reserv.c | 31 +++++++------- 5 files changed, 136 insertions(+), 123 deletions(-) diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 86ab2529e27f..2b85dbde1dd6 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -953,7 +953,7 @@ kmem_bootstrap_free(vm_offset_t start, vm_size_t size) vmd = vm_pagequeue_domain(m); vm_domain_free_lock(vmd); - vm_phys_free_pages(m, 0); + vm_phys_free_pages(m, m->pool, 0); vm_domain_free_unlock(vmd); vm_domain_freecnt_inc(vmd, 1); diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index ba22c7f97f2f..961b32da6599 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -572,6 +572,7 @@ vm_page_startup(vm_offset_t vaddr) #if defined(__i386__) && defined(VM_PHYSSEG_DENSE) long ii; #endif + int pool; #ifdef VM_FREEPOOL_LAZYINIT int lazyinit; #endif @@ -651,6 +652,8 @@ vm_page_startup(vm_offset_t vaddr) dump_add_page(pa); pa += PAGE_SIZE; } +#else + (void)pa; #endif /* * Compute the number of pages of memory that will be available for @@ -755,9 +758,12 @@ vm_page_startup(vm_offset_t vaddr) */ vm_phys_init(); + pool = VM_FREEPOOL_DEFAULT; #ifdef VM_FREEPOOL_LAZYINIT lazyinit = 1; TUNABLE_INT_FETCH("debug.vm.lazy_page_init", &lazyinit); + if (lazyinit) + pool = VM_FREEPOOL_LAZYINIT; #endif /* @@ -777,48 +783,27 @@ vm_page_startup(vm_offset_t vaddr) seg = &vm_phys_segs[segind]; /* - * If lazy vm_page initialization is not enabled, simply - * initialize all of the pages in the segment. Otherwise, we - * only initialize: - * 1. Pages not covered by phys_avail[], since they might be - * freed to the allocator at some future point, e.g., by - * kmem_bootstrap_free(). - * 2. The first page of each run of free pages handed to the - * vm_phys allocator, which in turn defers initialization - * of pages until they are needed. - * This avoids blocking the boot process for long periods, which - * may be relevant for VMs (which ought to boot as quickly as - * possible) and/or systems with large amounts of physical - * memory. + * Initialize pages not covered by phys_avail[], since they + * might be freed to the allocator at some future point, e.g., + * by kmem_bootstrap_free(). */ -#ifdef VM_FREEPOOL_LAZYINIT - if (lazyinit) { - startp = seg->start; - for (i = 0; phys_avail[i + 1] != 0; i += 2) { - if (startp >= seg->end) - break; - - if (phys_avail[i + 1] < startp) - continue; - if (phys_avail[i] <= startp) { - startp = phys_avail[i + 1]; - continue; - } - - m = vm_phys_seg_paddr_to_vm_page(seg, startp); - for (endp = MIN(phys_avail[i], seg->end); - startp < endp; startp += PAGE_SIZE, m++) { - vm_page_init_page(m, startp, segind, - VM_FREEPOOL_DEFAULT); - } + startp = seg->start; + for (i = 0; phys_avail[i + 1] != 0; i += 2) { + if (startp >= seg->end) + break; + if (phys_avail[i + 1] < startp) + continue; + if (phys_avail[i] <= startp) { + startp = phys_avail[i + 1]; + continue; } - } else -#endif - for (m = seg->first_page, pa = seg->start; - pa < seg->end; m++, pa += PAGE_SIZE) { - vm_page_init_page(m, pa, segind, + m = vm_phys_seg_paddr_to_vm_page(seg, startp); + for (endp = MIN(phys_avail[i], seg->end); + startp < endp; startp += PAGE_SIZE, m++) { + vm_page_init_page(m, startp, segind, VM_FREEPOOL_DEFAULT); } + } /* * Add the segment's pages that are covered by one of @@ -835,16 +820,30 @@ vm_page_startup(vm_offset_t vaddr) if (pagecount == 0) continue; + /* + * If lazy vm_page initialization is not enabled, simply + * initialize all of the pages in the segment covered by + * phys_avail. Otherwise, initialize only the first + * page of each run of free pages handed to the vm_phys + * allocator, which in turn defers initialization of + * pages until they are needed. + * + * This avoids blocking the boot process for long + * periods, which may be relevant for VMs (which ought + * to boot as quickly as possible) and/or systems with + * large amounts of physical memory. + */ m = vm_phys_seg_paddr_to_vm_page(seg, startp); -#ifdef VM_FREEPOOL_LAZYINIT - if (lazyinit) { - vm_page_init_page(m, startp, segind, - VM_FREEPOOL_LAZYINIT); + vm_page_init_page(m, startp, segind, pool); + if (pool == VM_FREEPOOL_DEFAULT) { + for (int j = 1; j < pagecount; j++) { + vm_page_init_page(&m[j], + startp + ptoa(j), segind, pool); + } } -#endif vmd = VM_DOMAIN(seg->domain); vm_domain_free_lock(vmd); - vm_phys_enqueue_contig(m, pagecount); + vm_phys_enqueue_contig(m, pool, pagecount); vm_domain_free_unlock(vmd); vm_domain_freecnt_inc(vmd, pagecount); vm_cnt.v_page_count += (u_int)pagecount; @@ -2341,6 +2340,7 @@ found: m->flags = flags; m->a.flags = 0; m->oflags = (object->flags & OBJ_UNMANAGED) != 0 ? VPO_UNMANAGED : 0; + m->pool = VM_FREEPOOL_DEFAULT; if ((req & (VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY)) == 0) m->busy_lock = VPB_CURTHREAD_EXCLUSIVE; else if ((req & VM_ALLOC_SBUSY) != 0) @@ -2558,6 +2558,7 @@ vm_page_alloc_contig_domain(vm_object_t object, vm_pindex_t pindex, int domain, m->ref_count = 1; m->a.act_count = 0; m->oflags = oflags; + m->pool = VM_FREEPOOL_DEFAULT; if (vm_page_iter_insert(&pages, m, object, pindex, mpred)) { if ((req & VM_ALLOC_WIRED) != 0) vm_wire_sub(npages); @@ -2655,6 +2656,7 @@ found: m->flags = (m->flags & PG_ZERO) | flags; m->a.flags = 0; m->oflags = VPO_UNMANAGED; + m->pool = VM_FREEPOOL_DIRECT; m->busy_lock = VPB_UNBUSIED; if ((req & VM_ALLOC_WIRED) != 0) { vm_wire_add(1); @@ -2803,6 +2805,7 @@ vm_page_alloc_noobj_contig_domain(int domain, int req, u_long npages, m->ref_count = 1; m->a.act_count = 0; m->oflags = VPO_UNMANAGED; + m->pool = VM_FREEPOOL_DIRECT; /* * Zero the page before updating any mappings since the page is @@ -2881,7 +2884,7 @@ vm_page_zone_release(void *arg, void **store, int cnt) vm_domain_free_lock(vmd); for (i = 0; i < cnt; i++) { m = (vm_page_t)store[i]; - vm_phys_free_pages(m, 0); + vm_phys_free_pages(m, pgcache->pool, 0); } vm_domain_free_unlock(vmd); vm_domain_freecnt_inc(vmd, cnt); @@ -3266,7 +3269,7 @@ unlock: do { MPASS(vm_page_domain(m) == domain); SLIST_REMOVE_HEAD(&free, plinks.s.ss); - vm_phys_free_pages(m, 0); + vm_phys_free_pages(m, m->pool, 0); cnt++; } while ((m = SLIST_FIRST(&free)) != NULL); vm_domain_free_unlock(vmd); @@ -4271,7 +4274,7 @@ vm_page_free_toq(vm_page_t m) return; } vm_domain_free_lock(vmd); - vm_phys_free_pages(m, 0); + vm_phys_free_pages(m, m->pool, 0); vm_domain_free_unlock(vmd); vm_domain_freecnt_inc(vmd, 1); } diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index cf1ed5818b2f..0b7de1d34255 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -187,7 +187,7 @@ SYSCTL_INT(_vm, OID_AUTO, ndomains, CTLFLAG_RD, static void _vm_phys_create_seg(vm_paddr_t start, vm_paddr_t end, int domain); static void vm_phys_create_seg(vm_paddr_t start, vm_paddr_t end); static void vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl, - int order, int tail); + int order, int pool, int tail); static bool __diagused vm_phys_pool_valid(int pool) @@ -391,10 +391,12 @@ sysctl_vm_phys_locality(SYSCTL_HANDLER_ARGS) #endif static void -vm_freelist_add(struct vm_freelist *fl, vm_page_t m, int order, int tail) +vm_freelist_add(struct vm_freelist *fl, vm_page_t m, int order, int pool, + int tail) { m->order = order; + m->pool = pool; if (tail) TAILQ_INSERT_TAIL(&fl[order].pl, m, listq); else @@ -687,7 +689,7 @@ vm_phys_register_domains(int ndomains __numa_used, */ static __inline void vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl, int order, - int tail) + int pool, int tail) { vm_page_t m_buddy; @@ -697,19 +699,20 @@ vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl, int order, KASSERT(m_buddy->order == VM_NFREEORDER, ("vm_phys_split_pages: page %p has unexpected order %d", m_buddy, m_buddy->order)); - vm_freelist_add(fl, m_buddy, oind, tail); + vm_freelist_add(fl, m_buddy, oind, pool, tail); } } static void -vm_phys_enq_chunk(struct vm_freelist *fl, vm_page_t m, int order, int tail) +vm_phys_enq_chunk(struct vm_freelist *fl, vm_page_t m, int order, int pool, + int tail) { KASSERT(order >= 0 && order < VM_NFREEORDER, ("%s: invalid order %d", __func__, order)); - vm_freelist_add(fl, m, order, tail); + vm_freelist_add(fl, m, order, pool, tail); #ifdef VM_FREEPOOL_LAZYINIT - if (__predict_false(m->pool == VM_FREEPOOL_LAZYINIT)) { + if (__predict_false(pool == VM_FREEPOOL_LAZYINIT)) { vm_page_t m_next; vm_paddr_t pa; int npages; @@ -738,7 +741,8 @@ vm_phys_enq_chunk(struct vm_freelist *fl, vm_page_t m, int order, int tail) * The physical page m's buddy must not be free. */ static void -vm_phys_enq_beg(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) +vm_phys_enq_beg(vm_page_t m, u_int npages, struct vm_freelist *fl, int pool, + int tail) { int order; @@ -754,7 +758,7 @@ vm_phys_enq_beg(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) order = ilog2(npages); KASSERT(order < VM_NFREEORDER, ("%s: order %d is out of range", __func__, order)); - vm_phys_enq_chunk(fl, m, order, tail); + vm_phys_enq_chunk(fl, m, order, pool, tail); m += 1 << order; npages -= 1 << order; } @@ -774,7 +778,8 @@ vm_phys_enq_beg(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) * parameter m. Otherwise, the physical page m's buddy must not be free. */ static vm_page_t -vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) +vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int pool, + int tail) { int order; @@ -788,7 +793,7 @@ vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) ("vm_phys_enq_range: page %p has unexpected order %d", m, m->order)); order = ffs(npages) - 1; - vm_phys_enq_chunk(fl, m, order, tail); + vm_phys_enq_chunk(fl, m, order, pool, tail); m += 1 << order; npages -= 1 << order; } @@ -796,33 +801,30 @@ vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) } /* - * Set the pool for a contiguous, power of two-sized set of physical pages. + * Complete initialization a contiguous, power of two-sized set of physical + * pages. * * If the pages currently belong to the lazy init pool, then the corresponding * page structures must be initialized. In this case it is assumed that the * first page in the run has already been initialized. */ static void -vm_phys_set_pool(int pool, vm_page_t m, int order) +vm_phys_finish_init(vm_page_t m, int order) { #ifdef VM_FREEPOOL_LAZYINIT if (__predict_false(m->pool == VM_FREEPOOL_LAZYINIT)) { vm_paddr_t pa; int segind; - m->pool = pool; - TSENTER(); pa = m->phys_addr + PAGE_SIZE; segind = m->segind; for (vm_page_t m_tmp = m + 1; m_tmp < &m[1 << order]; m_tmp++, pa += PAGE_SIZE) - vm_page_init_page(m_tmp, pa, segind, pool); + vm_page_init_page(m_tmp, pa, segind, VM_NFREEPOOL); TSEXIT(); - } else + } #endif - for (vm_page_t m_tmp = m; m_tmp < &m[1 << order]; m_tmp++) - m_tmp->pool = pool; } /* @@ -833,7 +835,8 @@ vm_phys_set_pool(int pool, vm_page_t m, int order) * The returned pages may not be physically contiguous. However, in contrast * to performing multiple, back-to-back calls to vm_phys_alloc_pages(..., 0), * calling this function once to allocate the desired number of pages will - * avoid wasted time in vm_phys_split_pages(). + * avoid wasted time in vm_phys_split_pages(). The allocated pages have no + * valid pool field set. * * The free page queues for the specified domain must be locked. */ @@ -869,7 +872,8 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) * Return excess pages to fl. Its order * [0, oind) queues are empty. */ - vm_phys_enq_range(m, avail - i, fl, 1); + vm_phys_enq_range(m, avail - i, fl, + pool, 1); return (npages); } } @@ -881,7 +885,7 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) while ((m = TAILQ_FIRST(&alt[oind].pl)) != NULL) { vm_freelist_rem(alt, m, oind); - vm_phys_set_pool(pool, m, oind); + vm_phys_finish_init(m, oind); avail = i + (1 << oind); end = imin(npages, avail); while (i < end) @@ -893,7 +897,7 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) * are empty. */ vm_phys_enq_range(m, avail - i, - fl, 1); + fl, pool, 1); return (npages); } } @@ -940,7 +944,7 @@ vm_phys_alloc_freelist_pages(int domain, int freelist, int pool, int order) if (m != NULL) { vm_freelist_rem(fl, m, oind); /* The order [order, oind) queues are empty. */ - vm_phys_split_pages(m, oind, fl, order, 1); + vm_phys_split_pages(m, oind, fl, order, pool, 1); return (m); } } @@ -957,9 +961,9 @@ vm_phys_alloc_freelist_pages(int domain, int freelist, int pool, int order) m = TAILQ_FIRST(&alt[oind].pl); if (m != NULL) { vm_freelist_rem(alt, m, oind); - vm_phys_set_pool(pool, m, oind); + vm_phys_finish_init(m, oind); /* The order [order, oind) queues are empty. */ - vm_phys_split_pages(m, oind, fl, order, 1); + vm_phys_split_pages(m, oind, fl, order, pool, 1); return (m); } } @@ -1198,11 +1202,12 @@ vm_phys_fictitious_unreg_range(vm_paddr_t start, vm_paddr_t end) /* * Free a contiguous, power of two-sized set of physical pages. + * The pool field in the first page determines the destination pool. * * The free page queues must be locked. */ void -vm_phys_free_pages(vm_page_t m, int order) +vm_phys_free_pages(vm_page_t m, int pool, int order) { struct vm_freelist *fl; struct vm_phys_seg *seg; @@ -1210,13 +1215,12 @@ vm_phys_free_pages(vm_page_t m, int order) vm_page_t m_buddy; KASSERT(m->order == VM_NFREEORDER, - ("vm_phys_free_pages: page %p has unexpected order %d", - m, m->order)); - KASSERT(vm_phys_pool_valid(m->pool), - ("vm_phys_free_pages: page %p has unexpected pool %d", - m, m->pool)); + ("%s: page %p has unexpected order %d", + __func__, m, m->order)); + KASSERT(vm_phys_pool_valid(pool), + ("%s: unexpected pool param %d", __func__, pool)); KASSERT(order < VM_NFREEORDER, - ("vm_phys_free_pages: order %d is out of range", order)); + ("%s: order %d is out of range", __func__, order)); seg = &vm_phys_segs[m->segind]; vm_domain_free_assert_locked(VM_DOMAIN(seg->domain)); if (order < VM_NFREEORDER - 1) { @@ -1230,15 +1234,14 @@ vm_phys_free_pages(vm_page_t m, int order) break; fl = (*seg->free_queues)[m_buddy->pool]; vm_freelist_rem(fl, m_buddy, order); - if (m_buddy->pool != m->pool) - vm_phys_set_pool(m->pool, m_buddy, order); + vm_phys_finish_init(m_buddy, order); order++; pa &= ~(((vm_paddr_t)1 << (PAGE_SHIFT + order)) - 1); m = vm_phys_seg_paddr_to_vm_page(seg, pa); } while (order < VM_NFREEORDER - 1); } - fl = (*seg->free_queues)[m->pool]; - vm_freelist_add(fl, m, order, 1); + fl = (*seg->free_queues)[pool]; + vm_freelist_add(fl, m, order, pool, 1); } #ifdef VM_FREEPOOL_LAZYINIT @@ -1290,12 +1293,13 @@ vm_phys_lazy_init_domain(int domain, bool locked) VM_ALLOC_NORMAL, 1 << oind); if (unlocked) vm_domain_free_unlock(vmd); - vm_phys_set_pool(VM_FREEPOOL_DEFAULT, m, oind); + vm_phys_finish_init(m, oind); if (unlocked) { vm_domain_freecnt_inc(vmd, 1 << oind); vm_domain_free_lock(vmd); } - vm_phys_free_pages(m, oind); + vm_phys_free_pages(m, VM_FREEPOOL_DEFAULT, + oind); } } } @@ -1344,12 +1348,12 @@ SYSINIT(vm_phys_lazy_init, SI_SUB_SMP, SI_ORDER_ANY, vm_phys_lazy_sysinit, /* * Free a contiguous, arbitrarily sized set of physical pages, without - * merging across set boundaries. + * merging across set boundaries. Assumes no pages have a valid pool field. * * The free page queues must be locked. */ void -vm_phys_enqueue_contig(vm_page_t m, u_long npages) +vm_phys_enqueue_contig(vm_page_t m, int pool, u_long npages) { struct vm_freelist *fl; struct vm_phys_seg *seg; @@ -1363,14 +1367,15 @@ vm_phys_enqueue_contig(vm_page_t m, u_long npages) */ vm_domain_free_assert_locked(vm_pagequeue_domain(m)); seg = &vm_phys_segs[m->segind]; - fl = (*seg->free_queues)[m->pool]; + fl = (*seg->free_queues)[pool]; m_end = m + npages; /* Free blocks of increasing size. */ lo = atop(VM_PAGE_TO_PHYS(m)); if (m < m_end && (diff = lo ^ (lo + npages - 1)) != 0) { order = min(ilog2(diff), VM_NFREEORDER - 1); - m = vm_phys_enq_range(m, roundup2(lo, 1 << order) - lo, fl, 1); + m = vm_phys_enq_range(m, roundup2(lo, 1 << order) - lo, fl, + pool, 1); } /* Free blocks of maximum size. */ @@ -1379,20 +1384,22 @@ vm_phys_enqueue_contig(vm_page_t m, u_long npages) KASSERT(seg == &vm_phys_segs[m->segind], ("%s: page range [%p,%p) spans multiple segments", __func__, m_end - npages, m)); - vm_phys_enq_chunk(fl, m, order, 1); + vm_phys_enq_chunk(fl, m, order, pool, 1); m += 1 << order; } /* Free blocks of diminishing size. */ - vm_phys_enq_beg(m, m_end - m, fl, 1); + vm_phys_enq_beg(m, m_end - m, fl, pool, 1); } /* * Free a contiguous, arbitrarily sized set of physical pages. + * Assumes that every page but the first has no valid pool field. + * Uses the pool value in the first page if valid, otherwise default. * * The free page queues must be locked. */ void -vm_phys_free_contig(vm_page_t m, u_long npages) +vm_phys_free_contig(vm_page_t m, int pool, u_long npages) { vm_paddr_t lo; vm_page_t m_start, m_end; @@ -1416,11 +1423,11 @@ vm_phys_free_contig(vm_page_t m, u_long npages) * end of the range last. */ if (m_start < m_end) - vm_phys_enqueue_contig(m_start, m_end - m_start); + vm_phys_enqueue_contig(m_start, pool, m_end - m_start); if (order_start < max_order) - vm_phys_free_pages(m, order_start); + vm_phys_free_pages(m, pool, order_start); if (order_end < max_order) - vm_phys_free_pages(m_end, order_end); + vm_phys_free_pages(m_end, pool, order_end); } /* @@ -1474,15 +1481,15 @@ vm_phys_unfree_page(vm_paddr_t pa) struct vm_phys_seg *seg; vm_paddr_t pa_half; vm_page_t m, m_set, m_tmp; - int order; + int order, pool; seg = vm_phys_paddr_to_seg(pa); vm_domain_free_assert_locked(VM_DOMAIN(seg->domain)); +#ifdef VM_FREEPOOL_LAZYINIT /* * The pages on the free lists must be initialized. */ -#ifdef VM_FREEPOOL_LAZYINIT vm_phys_lazy_init_domain(seg->domain, true); #endif @@ -1515,7 +1522,8 @@ vm_phys_unfree_page(vm_paddr_t pa) * is larger than a page, shrink "m_set" by returning the half * of "m_set" that does not contain "m" to the free lists. */ - fl = (*seg->free_queues)[m_set->pool]; + pool = m_set->pool; + fl = (*seg->free_queues)[pool]; order = m_set->order; vm_freelist_rem(fl, m_set, order); while (order > 0) { @@ -1527,7 +1535,7 @@ vm_phys_unfree_page(vm_paddr_t pa) m_tmp = m_set; m_set = vm_phys_seg_paddr_to_vm_page(seg, pa_half); } - vm_freelist_add(fl, m_tmp, order, 0); + vm_freelist_add(fl, m_tmp, order, pool, 0); } KASSERT(m_set == m, ("vm_phys_unfree_page: fatal inconsistency")); return (true); @@ -1668,7 +1676,8 @@ vm_phys_find_queues_contig( * alignment of the first physical page in the set. If the given value * "boundary" is non-zero, then the set of physical pages cannot cross * any physical address boundary that is a multiple of that value. Both - * "alignment" and "boundary" must be a power of two. + * "alignment" and "boundary" must be a power of two. Sets the pool + * field to DEFAULT in the first allocated page. */ vm_page_t vm_phys_alloc_contig(int domain, u_long npages, vm_paddr_t low, vm_paddr_t high, @@ -1727,12 +1736,12 @@ vm_phys_alloc_contig(int domain, u_long npages, vm_paddr_t low, vm_paddr_t high, fl = (*queues)[m->pool]; oind = m->order; vm_freelist_rem(fl, m, oind); - if (m->pool != VM_FREEPOOL_DEFAULT) - vm_phys_set_pool(VM_FREEPOOL_DEFAULT, m, oind); + vm_phys_finish_init(m, oind); } /* Return excess pages to the free lists. */ fl = (*queues)[VM_FREEPOOL_DEFAULT]; - vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, 0); + vm_phys_enq_range(&m_run[npages], m - &m_run[npages], fl, + VM_FREEPOOL_DEFAULT, 0); /* Return page verified to satisfy conditions of request. */ pa_start = VM_PAGE_TO_PHYS(m_run); diff --git a/sys/vm/vm_phys.h b/sys/vm/vm_phys.h index 43d94a9420f2..046fe26b476d 100644 --- a/sys/vm/vm_phys.h +++ b/sys/vm/vm_phys.h @@ -64,15 +64,15 @@ vm_page_t vm_phys_alloc_contig(int domain, u_long npages, vm_paddr_t low, int vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]); vm_page_t vm_phys_alloc_pages(int domain, int pool, int order); int vm_phys_domain_match(int prefer, vm_paddr_t low, vm_paddr_t high); -void vm_phys_enqueue_contig(vm_page_t m, u_long npages); +void vm_phys_enqueue_contig(vm_page_t m, int pool, u_long npages); int vm_phys_fictitious_reg_range(vm_paddr_t start, vm_paddr_t end, vm_memattr_t memattr); void vm_phys_fictitious_unreg_range(vm_paddr_t start, vm_paddr_t end); vm_page_t vm_phys_fictitious_to_vm_page(vm_paddr_t pa); int vm_phys_find_range(vm_page_t bounds[], int segind, int domain, u_long npages, vm_paddr_t low, vm_paddr_t high); -void vm_phys_free_contig(vm_page_t m, u_long npages); -void vm_phys_free_pages(vm_page_t m, int order); +void vm_phys_free_contig(vm_page_t m, int pool, u_long npages); +void vm_phys_free_pages(vm_page_t m, int pool, int order); void vm_phys_init(void); vm_page_t vm_phys_paddr_to_vm_page(vm_paddr_t pa); vm_page_t vm_phys_seg_paddr_to_vm_page(struct vm_phys_seg *seg, vm_paddr_t pa); diff --git a/sys/vm/vm_reserv.c b/sys/vm/vm_reserv.c index ad513962d50d..04453e050a38 100644 --- a/sys/vm/vm_reserv.c +++ b/sys/vm/vm_reserv.c @@ -480,7 +480,7 @@ vm_reserv_depopulate(vm_reserv_t rv, int index) if (rv->popcnt == 0) { vm_reserv_remove(rv); vm_domain_free_lock(vmd); - vm_phys_free_pages(rv->pages, VM_LEVEL_0_ORDER); + vm_phys_free_pages(rv->pages, rv->pages->pool, VM_LEVEL_0_ORDER); vm_domain_free_unlock(vmd); counter_u64_add(vm_reserv_freed, 1); } @@ -943,7 +943,7 @@ static void vm_reserv_break(vm_reserv_t rv) { vm_page_t m; - int hi, lo, pos; + int pos, pos0, pos1; vm_reserv_assert_locked(rv); CTR5(KTR_VM, "%s: rv %p object %p popcnt %d inpartpop %d", @@ -954,23 +954,24 @@ vm_reserv_break(vm_reserv_t rv) for (; m < rv->pages + VM_LEVEL_0_NPAGES; m += VM_SUBLEVEL_0_NPAGES) #endif m->psind = 0; - hi = lo = -1; - pos = 0; - for (;;) { - bit_ff_at(rv->popmap, pos, VM_LEVEL_0_NPAGES, lo != hi, &pos); - if (lo == hi) { - if (pos == -1) - break; - lo = pos; - continue; - } + pos0 = bit_test(rv->popmap, 0) ? -1 : 0; + pos1 = -1 - pos0; + for (pos = 0; pos < VM_LEVEL_0_NPAGES; ) { + /* Find the first different bit after pos. */ + bit_ff_at(rv->popmap, pos + 1, VM_LEVEL_0_NPAGES, + pos1 < pos0, &pos); if (pos == -1) pos = VM_LEVEL_0_NPAGES; - hi = pos; + if (pos0 < pos1) { + pos0 = pos; + continue; + } + /* Free unused pages from pos0 to pos. */ + pos1 = pos; vm_domain_free_lock(VM_DOMAIN(rv->domain)); - vm_phys_enqueue_contig(&rv->pages[lo], hi - lo); + vm_phys_enqueue_contig(&rv->pages[pos0], VM_FREEPOOL_DEFAULT, + pos1 - pos0); vm_domain_free_unlock(VM_DOMAIN(rv->domain)); - lo = hi; } bit_nclear(rv->popmap, 0, VM_LEVEL_0_NPAGES - 1); rv->popcnt = 0; From nobody Wed Jan 29 10:01:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yjd2h1yLBz5mTKB; Wed, 29 Jan 2025 10:01: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 4Yjd2h1LqFz3vtq; Wed, 29 Jan 2025 10:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738144860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IZ/SpQxZ8/t26ybumKPvufeOvVWkfnl+xx0Vw5HE7KE=; b=P1ggp5c3N1MzY5yHzGhuXRDyNWCApEedw7iUxTmVo/sIxxDWIRyzXFAz9BIhV53BQm/pms vfrtcNH8EsDgj4gX4ZYidLqM3oLO87FlJTSVFXZHdOTtWS/B6kkshXVffrOtRrPpyoNwK3 qoyrYW11JdiRunENlVFFqHtNJlUcbmpoLQm0zZBfRnyLkeJRczJRDz1aM7YiwLisXiEcY3 TWMtYTBzg4zVevljY6+Iwg6DOGj833A7qHX2uhUEIEMADcqvy03s+2m16Ofp7ZBN63FSSO DF37dibw9t9s5h9ImhTxiDjN9n1McfEFs9MVTuzDwG0QTftev03ltgCY6+NmxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738144860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IZ/SpQxZ8/t26ybumKPvufeOvVWkfnl+xx0Vw5HE7KE=; b=grQllRKiORmDLxDdNzaIxy2MVQhqBEfrBVAMRXFwf/D6TNMi92V3jfg26HPTWVCx5Hmu/K xpwsFmO/bDHflfjtEtZUSoPP5OWT4ocz1h8yMlS0wVrAKftBovHqqvsCOtGBm53vxbzS/j 8Bf2E/gILonKrpsMc9KFCUXnN/vOKtP6wutDHxAjT59TY00qYOxO5qgsW41ry4ZPH+9PKq S5l0BjZHk5KHS8v/cS5XNCCsWtJ4VZ1NCo9++nGrSynqoK6tE56McexIU6nCZr1GVuq7dD j0EddOUKao0ZSLKo5mKUzlUlPoyisXOpdxlLfkYo+PmRWOMfME695uSYxeQ0pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738144860; a=rsa-sha256; cv=none; b=wpgokdG/YfsydYQPPG+lFLjLbS2aH0MlmZFv6qLUKLDlGNU6vwrMgghV1+KuemuxU6z8WY X0LJkwjZ0se6k1cvcC/GCGpatOWkVyiWEVDLESoV/RQIQrcA/TLtNX1f6phCMVC9y7zsQX ez+sy8hMWtPxK10QRne5pb7M0cpeWEOCJhBKT/K7dfpUAANi6rVbsDE5wrAqJgMNzagKzs IZ2VAqcS882fAewZZ9QgZb8+wd8/POQhtjQARPV+rnVcHgHQgm9NYqiugICpWwT3jdG0gn nmCskdLwrP6P9ZwCKFW83LIO7xjJUjCbSa4V7PcwzXMWvgxCmjLhJ7U1klsvYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yjd2h0yLMzwkn; Wed, 29 Jan 2025 10:01: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 50TA10nx064242; Wed, 29 Jan 2025 10:01:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TA10gh064239; Wed, 29 Jan 2025 10:01:00 GMT (envelope-from git) Date: Wed, 29 Jan 2025 10:01:00 GMT Message-Id: <202501291001.50TA10gh064239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 13ce55b66fad - main - ip6addrctl(8): Strictly check the number of arguments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13ce55b66fad2b2b4054a89a1a906f58dc33683b Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=13ce55b66fad2b2b4054a89a1a906f58dc33683b commit 13ce55b66fad2b2b4054a89a1a906f58dc33683b Author: Zhenlei Huang AuthorDate: 2025-01-29 10:00:07 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-29 10:00:07 +0000 ip6addrctl(8): Strictly check the number of arguments The additional arguments are useless but may tempt user a wrong usage. Reviewed by: dfr MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48701 --- usr.sbin/ip6addrctl/ip6addrctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c index 146b2f1ad3e0..dd5df48048aa 100644 --- a/usr.sbin/ip6addrctl/ip6addrctl.c +++ b/usr.sbin/ip6addrctl/ip6addrctl.c @@ -75,22 +75,24 @@ static void flush_policy(void); int main(int argc, char *argv[]) { - if (argc == 1 || strcasecmp(argv[1], "show") == 0) { + if (argc == 1 || (argc == 2 && strcasecmp(argv[1], "show") == 0)) { get_policy(); dump_policy(); } else if (strcasecmp(argv[1], "add") == 0) { - if (argc < 5) + if (argc != 5) usage(); add_policy(argv[2], argv[3], argv[4]); } else if (strcasecmp(argv[1], "delete") == 0) { - if (argc < 3) + if (argc != 3) usage(); delete_policy(argv[2]); } else if (strcasecmp(argv[1], "flush") == 0) { + if (argc != 2) + usage(); get_policy(); flush_policy(); } else if (strcasecmp(argv[1], "install") == 0) { - if (argc < 3) + if (argc != 3) usage(); configfile = argv[2]; make_policy_fromfile(configfile); From nobody Wed Jan 29 10:01:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yjd2j5Bhqz5mTTn; Wed, 29 Jan 2025 10:01: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 4Yjd2j2Srfz3vly; Wed, 29 Jan 2025 10:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738144861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nqX31xuRIXT4FAo1llu6h05FlswHLprNYEVL8JRwW8E=; b=fh8B2NAagU6eXF8nyMBOrNlR+WonRZLwJKK5i42m1BDAyDIHDDip6oEej3vr0ZIesV0Oi6 xaYV0lgOfoqWJZeR0tRJvvbNa3IJOoIeu3yi9BLYsPTKTD4cOliYKxhHQ1LHnZfEO6JPlM 23t5x6zmnZ4bh6byECiCHQWLxKlvfcd0B0wLuQs2yoO5cQj18YBVquCHbVJjaBdpZq1KDv Vd80xbRLz5pqPcHxMV3WrSBkCdV0LJArLkMJeKz7qDg0T9Rhv9lCSDWNI8F44ueQECPZME oOmzVKlNx8Bpc5MaLddoKDX4FiN5723EapdzDqdi/o1OqnUeHIqCkpNrrpAdKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738144861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nqX31xuRIXT4FAo1llu6h05FlswHLprNYEVL8JRwW8E=; b=MPdmEtRP72S/Q1arAJwu/UNj2w55ovRkH7kfbmrX/QaI+9LH7loFECMnBChaQV3D7jVlMt HHZzQlzRwisEXqehh2Fj4EBRn2wpjVJqLxMPUpH1UzGKSJPeOaWt8HnoQj0g+DSFCVx9ad L3Gf81M8u+OMAv9wKETfDH6FJosRyk7aZ6t+rKR/46A0tAt1+IKf51IfHWXpPm0rpjTYn0 f8AnzdISAQLZuVmd5e+ImnreNBIy+3J64vjlnxRrZdERQNIrIP4z5qZchTqjHw4ToewGkY g1NLHv/WM1VTtmNIAKRuViey1Xk9s+YKlM6wtcYMQZjooZTVjnCed3TXbPsmog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738144861; a=rsa-sha256; cv=none; b=dvi63u3APrt5IPo8KKRUc4tZwZTxIoFIR27Oy8KSvqnuEUWl3QxscSxgoPp1Bwj9BMB/QP BCNs/VgbccjzTCE9JfvxeIIge9VTLWzC5atzt37We0rmsb3mtNM2II5DxD53dTqxPlHRgb MGRQ0yILdAqZYQ1anym05zJydmmQ8sRpKfIpyVZ5yz/n54EnJwZuq1YKZEzUwsVaqQZukx h5Wa7kGhGTHn/1bwnhXdfCL9er58b6Dn6x6YR5UtyhPYSjUjikVKfZ/0WHhq9pZ6Mvn7tU KEpA+EH0sgbNqg7AZ2HPuawtjmLbcNcam55WG5w2agqaEyDsmmXizfZYxcfZKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yjd2j1tK6zwkp; Wed, 29 Jan 2025 10:01: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 50TA11hs064276; Wed, 29 Jan 2025 10:01:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TA11eQ064273; Wed, 29 Jan 2025 10:01:01 GMT (envelope-from git) Date: Wed, 29 Jan 2025 10:01:01 GMT Message-Id: <202501291001.50TA11eQ064273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 6dcdd79a251b - main - ip6addrctl(8): Teach ip6addrctl to attach and run itself in a jail List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dcdd79a251b5e62ff9ce562ad451e92dec39408 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6dcdd79a251b5e62ff9ce562ad451e92dec39408 commit 6dcdd79a251b5e62ff9ce562ad451e92dec39408 Author: Zhenlei Huang AuthorDate: 2025-01-29 10:00:07 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-29 10:00:07 +0000 ip6addrctl(8): Teach ip6addrctl to attach and run itself in a jail This will make it easier to manage address selection policies of vnet jails, especially for those light weighted OCI containers or slim jails. Requested by: dfr Reviewed by: dfr, markj MFC after: 1 week Relnotes: yes Differential Revision: https://reviews.freebsd.org/D48679 --- usr.sbin/ip6addrctl/Makefile | 7 ++++ usr.sbin/ip6addrctl/ip6addrctl.8 | 12 +++++- usr.sbin/ip6addrctl/ip6addrctl.c | 85 ++++++++++++++++++++++++++++++++-------- 3 files changed, 86 insertions(+), 18 deletions(-) diff --git a/usr.sbin/ip6addrctl/Makefile b/usr.sbin/ip6addrctl/Makefile index ba38dc1162d9..356c524629d8 100644 --- a/usr.sbin/ip6addrctl/Makefile +++ b/usr.sbin/ip6addrctl/Makefile @@ -1,5 +1,12 @@ +.include + PACKAGE= runtime PROG= ip6addrctl MAN= ip6addrctl.8 +.if ${MK_JAIL} != "no" +CFLAGS+= -DJAIL +LIBADD+= jail +.endif + .include diff --git a/usr.sbin/ip6addrctl/ip6addrctl.8 b/usr.sbin/ip6addrctl/ip6addrctl.8 index 50245cef91ea..8d3b1a229859 100644 --- a/usr.sbin/ip6addrctl/ip6addrctl.8 +++ b/usr.sbin/ip6addrctl/ip6addrctl.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 10, 2024 +.Dd January 29, 2025 .Dt IP6ADDRCTL 8 .Os .\" @@ -37,16 +37,21 @@ .\" .Sh SYNOPSIS .Nm +.Op Fl j Ar jail .Op Cm show .Nm +.Op Fl j Ar jail .Cm add .Ar prefix precedence label .Nm +.Op Fl j Ar jail .Cm delete .Ar prefix .Nm +.Op Fl j Ar jail .Cm flush .Nm +.Op Fl j Ar jail .Cm install .Ar configfile .\" @@ -62,6 +67,10 @@ is invoked without an argument or with a single argument it prints the content of the policy table currently installed in the kernel. .Pp +To operate inside a jail, the option +.Op Fl j Ar jail +should precede other options. +.Pp To modify the table, the following operations are available: .Bl -tag -width indent .It Cm add Ar prefix precedence label @@ -100,6 +109,7 @@ In the configuration file, lines beginning with the pound-sign .Pq Ql # are comments and are ignored. +Note that the configuration file will be processed before attaching to a jail. .El .\" .Sh EXIT STATUS diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c index dd5df48048aa..b42a839c62eb 100644 --- a/usr.sbin/ip6addrctl/ip6addrctl.c +++ b/usr.sbin/ip6addrctl/ip6addrctl.c @@ -36,6 +36,9 @@ #include #include #include +#ifdef JAIL +#include +#endif #include #include @@ -45,12 +48,18 @@ #include #include +#ifdef JAIL +#include +#endif #include #include #include #include #include +#ifdef JAIL +static char *jailname; +#endif static char *configfile; struct policyqueue { @@ -61,6 +70,7 @@ TAILQ_HEAD(policyhead, policyqueue); static struct policyhead policyhead = TAILQ_HEAD_INITIALIZER(policyhead); static void usage(void) __dead2; +static void attach_jail(void); static void get_policy(void); static void dump_policy(void); static int mask2plen(struct sockaddr_in6 *); @@ -75,27 +85,51 @@ static void flush_policy(void); int main(int argc, char *argv[]) { - if (argc == 1 || (argc == 2 && strcasecmp(argv[1], "show") == 0)) { + int ch; + + while ((ch = getopt(argc, argv, "j:")) != -1) { + switch (ch) { + case 'j': +#ifdef JAIL + if ((jailname = optarg) == NULL) + usage(); +#else + errx(1, "not built with jail support"); +#endif + break; + default: + usage(); + } + } + argc -= optind; + argv += optind; + + if (argc == 0 || (argc == 1 && strcasecmp(argv[0], "show") == 0)) { + attach_jail(); get_policy(); dump_policy(); - } else if (strcasecmp(argv[1], "add") == 0) { - if (argc != 5) + } else if (strcasecmp(argv[0], "add") == 0) { + if (argc != 4) usage(); - add_policy(argv[2], argv[3], argv[4]); - } else if (strcasecmp(argv[1], "delete") == 0) { - if (argc != 3) - usage(); - delete_policy(argv[2]); - } else if (strcasecmp(argv[1], "flush") == 0) { + attach_jail(); + add_policy(argv[1], argv[2], argv[3]); + } else if (strcasecmp(argv[0], "delete") == 0) { if (argc != 2) usage(); + attach_jail(); + delete_policy(argv[1]); + } else if (strcasecmp(argv[0], "flush") == 0) { + if (argc != 1) + usage(); + attach_jail(); get_policy(); flush_policy(); - } else if (strcasecmp(argv[1], "install") == 0) { - if (argc != 3) + } else if (strcasecmp(argv[0], "install") == 0) { + if (argc != 2) usage(); - configfile = argv[2]; + configfile = argv[1]; make_policy_fromfile(configfile); + attach_jail(); set_policy(); } else usage(); @@ -103,6 +137,23 @@ main(int argc, char *argv[]) exit(0); } +static void +attach_jail(void) +{ +#ifdef JAIL + int jid; + + if (jailname == NULL) + return; + + jid = jail_getid(jailname); + if (jid == -1) + errx(1, "jail not found"); + if (jail_attach(jid) != 0) + errx(1, "cannot attach to jail"); +#endif +} + static void get_policy(void) { @@ -445,12 +496,12 @@ flush_policy(void) static void usage(void) { - fprintf(stderr, "usage: ip6addrctl [show]\n"); - fprintf(stderr, " ip6addrctl add " + fprintf(stderr, "usage: ip6addrctl [-j jail] [show]\n"); + fprintf(stderr, " ip6addrctl [-j jail] add " "