From nobody Fri Jul 10 04:18:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gxJVX6BYYz6kRQx for ; Fri, 10 Jul 2026 04:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gxJVX4xXMz3bqV for ; Fri, 10 Jul 2026 04:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783657124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jkwoN7c9PK0aeosD+FtkCSxOagsXRRW+Pw+FzCYJlLs=; b=qPhaYuDYlyHABqmOwbOEu/BRuDV/17aC8VsiZ/VjbVAM/LIJfQa0wldQQBKKBDDTMG5dof W9yUPJvxFwmPqy2iX6VYOvktmD5s8p+53bk8rEdxY4tJQTooMkTX9bQvumkJFPsL15AbT/ 5xhEDR063Fgmy0ll72/VHVAXJ8Wn0UmA3MVmiKK7HGxs//trfwln8Ib4XkgViFvW8ZPC0U qetrmkt1oGbmTuYpZ2ffD8TDb6zaEEpTsnoKd15pOiS9YepOiriuiKXKScClvBbx5dI6Nk VW/E6U0HqVTc5BsyYhRPTPjQIs9tyXhuz2Oz51qNpIIDFgQ4saxMlHkAcsG2NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783657124; a=rsa-sha256; cv=none; b=oLVX3VLqYqOmi4gZ8wYEghvP8t2s5LKZcdWXrhEAZJcprpjmY53NO9B3w+scl6+yjPyM46 mzzLboqnpi4Hgvmqm0SxnWXU9mwX55v2K/w6weth59yjkLY7A+MilwygCiDMgYomM1St+E pHQNbKuGOTKXhq96PJt5nh2FIVuwUdtF7hCEn+GMND/5HEH+xho7ulsWE7cDcQxgckWApt JHonG0wjaATXfK/RX5e3Uwuf9Qpveqwg3ZBzZ+PG2Bhl/G6AEql3V0FRsgta71EBpYhqGK 0XPgIikYXSn23RIJZjQ7FGnIpDLFTOqbvZwRRF7w2w9x4Zo9Y8pQKsHCkTxIFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783657124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jkwoN7c9PK0aeosD+FtkCSxOagsXRRW+Pw+FzCYJlLs=; b=LvZ3Dt2xcD7T2KrqIYX3K5NwkwwA9xzambdRz4DkUfUyH3A7jfvIR/edMJb19A0z97V4Kv QQnuow4Wvdz/kYLWdzr/AZLxMDy7CvvB7uyoFETpDC+O4GVZx07juLeyPh1PPmwuSRkhrP eW6H2ZXQk19Aj6ulyoNTA/Gr4dsRTWW7hkBBzXhcPzST6ybrFLLJtLYoEtxT4fF3NjaA9N w4SwEsLOyhWwrg9MUKEnv1dZdUkLO1GxKFhAHomhCfdqqvEstKAV0xSs10Q6Vdg3ejaVn/ S9nnCw6Nxq6Lak4VW3CXsZIIdSFSBWoQHd35y9Cef0v43WRUififT1gIch2L8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gxJVX3RYlzg5L for ; Fri, 10 Jul 2026 04:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 328db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Jul 2026 04:18:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c8842f1d18ae - main - Revert "loader.efi: Trim ZFS searching for other booting options" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: c8842f1d18ae136cf5e3144540f76c7ebe0cd28a Auto-Submitted: auto-generated Date: Fri, 10 Jul 2026 04:18:44 +0000 Message-Id: <6a5072a4.328db.3ac30072@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c8842f1d18ae136cf5e3144540f76c7ebe0cd28a commit c8842f1d18ae136cf5e3144540f76c7ebe0cd28a Author: Warner Losh AuthorDate: 2026-07-10 04:04:52 +0000 Commit: Warner Losh CommitDate: 2026-07-10 04:09:41 +0000 Revert "loader.efi: Trim ZFS searching for other booting options" This reverts commit 3e3fd1fde8e168910edc538966111c0b5f03cd5f. This appears to break chainbooting with boot1.efi and similar scenarios with Root-on-ZFS scenarios. Revert until it's better understood. PR: 296309 Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D58071 --- stand/efi/loader/main.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index cc7a9c4ac814..891ae198a13f 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -681,21 +681,39 @@ find_currdev(bool do_bootmgr, char *boot_info, size_t boot_info_sz) #ifdef EFI_ZFS_BOOT /* - * Sixth Choice: With a relaxed policy, try ZFS pools on non-boot - * devices after the boot device has been fully exhausted. + * Sixth Choice: Probe the boot disk for ZFS and then probe the non-boot + * disk if we have a relaxed boot poluicy. */ - if (boot_policy == RELAXED) { + { zfsinfo_list_t *zfsinfo = efizfs_get_zfsinfo_list(); zfsinfo_t *zi; + /* + * Try ZFS pool(s) on the boot device not reachable via + * the partition walk above. + */ STAILQ_FOREACH(zi, zfsinfo, zi_link) { - if (zi->zi_handle == boot_img->DeviceHandle) + if (zi->zi_handle != boot_img->DeviceHandle) continue; - printf("Trying ZFS pool 0x%jx\n", - zi->zi_pool_guid); + printf("Trying ZFS pool 0x%jx\n", zi->zi_pool_guid); if (probe_zfs_currdev(zi->zi_pool_guid)) return (0); } + + /* + * With a relaxed policy, try pools on other devices only + * after the boot device has no bootable root. + */ + if (boot_policy == RELAXED) { + STAILQ_FOREACH(zi, zfsinfo, zi_link) { + if (zi->zi_handle == boot_img->DeviceHandle) + continue; + printf("Trying ZFS pool 0x%jx\n", + zi->zi_pool_guid); + if (probe_zfs_currdev(zi->zi_pool_guid)) + return (0); + } + } } #endif /* EFI_ZFS_BOOT */