From nobody Tue Jan 24 22:14:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1h8l1gfwz3bgsf; Tue, 24 Jan 2023 22:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h8k5pRLz3Lhk; Tue, 24 Jan 2023 22:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwEzoDDWlBDEiW/x5vYvD0/WnYH1EdGbCqHKn0mY2vA=; b=P2Tvo6FsDKaIGptsf3UfvvWB8T6J/yhggFXYMs60Lhn3ml1/UBpY/QPDOeGEdYJP8DFQeV joEO+C0Wx1lRnVK7+zG7B51HaJ+hT0ZEHhv6QrOB6EkqCaghuv/fRjveGc52WCCLwZ6vRF NjAMN3dKIpc6tzk475dTSGL517JBiFWIeKzuK2iy79dmaY/7/FrqA99Haa0whAVmdf+E7V 43eDkzHXEvZtxPUNEWGCYK5/ELTcQ0V38VXMVWiu1U0kevFT1QoGSNM72feM02fLGQFZ4J 7NRXvCucOyJk/68vX9d+OV7NI3gT5FWnXsdYGmLNf3FbzHJIZuMhTyT7jfGo6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwEzoDDWlBDEiW/x5vYvD0/WnYH1EdGbCqHKn0mY2vA=; b=yJtoy+pUJdqWyAyWVkkx0lEe91RJj+QbLepx9Ltm/O+NtQo4w5iRV/HAxxDyFXkdFYMNNs qT48jM5XNkQP0nYgshflcMYPrbz/pwhqtzhirkBqWD3PYDhPqrsD2PDfVOufOGPoIrHMuZ 9GN0GDDZQho90aYH4iFqY5T7ESq/coZzMh5IPuVDzO1A1waWrve4pj6oNFk/LNMQebp3Uf nz8tnSBLBpLbtSicsrSKxk1G7AUVmR9Fnu1r34xZHitpLdbY1Qipk5FAAyawyNwfyl9K2m fbloCvUmCVgxAJw7eWIUKLMhPPiGX+9SCPmoKh/63chfv5XLE2sT6dBtIgEklg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598470; a=rsa-sha256; cv=none; b=SMxDVuass59Qeie+ZUGOdiM9/HOqoOrh8dmCJTFx6Dj6Jyeuz+bGRkHx5H7p4Av47JiSvu iXDja3WwqRqThl8SJSd6hUNw6aOOpR/AsQWW63qJkouzIArntbzS3UW2+jUNuPRwEvlFS1 NOBeFMDmTPnW8gPsO9VeqTm8wZWFCT9NejLiIZk64BjK0I6OV5FI8mdi90Hdmnu6Rnmyyb znaZgNbDlqEbbE73jsGtbxdgykyKNCMKKHDHHrkNdGPkvJ8uQ1aNvSrDF3gx7UQf9zY5Q0 tqxQvaue088fZfeVSiUNiHl3e1CGxcTjdiUCGEa69gU+eBJRC3bbZbsGWQcV+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1h8k4clzzQqC; Tue, 24 Jan 2023 22:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMEUr4089921; Tue, 24 Jan 2023 22:14:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMEUCc089920; Tue, 24 Jan 2023 22:14:30 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:14:30 GMT Message-Id: <202301242214.30OMEUCc089920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: f168e96dfba2 - stable/13 - kboot: Add support for ZFS volumes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f168e96dfba283958182ec7f64712be072147dad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f168e96dfba283958182ec7f64712be072147dad commit f168e96dfba283958182ec7f64712be072147dad Author: Warner Losh AuthorDate: 2023-01-13 21:20:40 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:47 +0000 kboot: Add support for ZFS volumes Add the zfs device and filesystem to config and write the hook we need to probe zfs since there's not a generic mechanism in place to do that when ZFS is configured. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D38008 (cherry picked from commit f20ecce33a2a9a992fb267edf02edaa6eb9178b3) --- stand/kboot/conf.c | 9 +++++++++ stand/kboot/main.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/stand/kboot/conf.c b/stand/kboot/conf.c index ba6031b52783..160cd0ad9554 100644 --- a/stand/kboot/conf.c +++ b/stand/kboot/conf.c @@ -33,6 +33,9 @@ __FBSDID("$FreeBSD$"); #if defined(LOADER_NET_SUPPORT) #include "dev_net.h" #endif +#ifdef LOADER_ZFS_SUPPORT +#include "libzfs.h" +#endif extern struct devsw hostdisk; extern struct devsw host_dev; @@ -55,6 +58,9 @@ struct devsw *devsw[] = { &netdev, #endif &host_dev, +#if defined(LOADER_ZFS_SUPPORT) + &zfs_dev, /* Must be last */ +#endif NULL }; @@ -84,6 +90,9 @@ struct fs_ops *file_system[] = { #endif #if defined(LOADER_MSDOS_SUPPORT) &dosfs_fsops, +#endif +#if defined(LOADER_ZFS_SUPPORT) + &zfs_fsops, #endif &hostfs_fsops, NULL diff --git a/stand/kboot/main.c b/stand/kboot/main.c index 2e85121b7b12..d333737e164a 100644 --- a/stand/kboot/main.c +++ b/stand/kboot/main.c @@ -46,6 +46,7 @@ ssize_t kboot_readin(readin_handle_t fd, vm_offset_t dest, const size_t len); int kboot_autoload(void); uint64_t kboot_loadaddr(u_int type, void *data, uint64_t addr); static void kboot_kseg_get(int *nseg, void **ptr); +static void kboot_zfs_probe(void); extern int command_fdt_internal(int argc, char *argv[]); @@ -160,6 +161,7 @@ main(int argc, const char **argv) archsw.arch_autoload = kboot_autoload; archsw.arch_loadaddr = kboot_loadaddr; archsw.arch_kexec_kseg_get = kboot_kseg_get; + archsw.arch_zfs_probe = kboot_zfs_probe; /* Give us a sane world if we're running as init */ do_init(); @@ -380,6 +382,18 @@ kboot_kseg_get(int *nseg, void **ptr) *ptr = &loaded_segments[0]; } +static void +kboot_zfs_probe(void) +{ +#if defined(LOADER_ZFS_SUPPORT) + /* + * Open all the disks and partitions we can find to see if there are ZFS + * pools on them. + */ + hostdisk_zfs_probe(); +#endif +} + /* * Since proper fdt command handling function is defined in fdt_loader_cmd.c, * and declaring it as extern is in contradiction with COMMAND_SET() macro