From patchwork Fri Feb 24 14:04:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Heidelberg X-Patchwork-Id: 13151292 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 58FDFC61DA3 for ; Fri, 24 Feb 2023 14:10:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0EF0210E17D; Fri, 24 Feb 2023 14:10:20 +0000 (UTC) X-Greylist: delayed 336 seconds by postgrey-1.36 at gabe; Fri, 24 Feb 2023 14:10:17 UTC Received: from ixit.cz (ip-89-177-23-149.bb.vodafone.cz [89.177.23.149]) by gabe.freedesktop.org (Postfix) with ESMTPS id 34AE110E17D for ; Fri, 24 Feb 2023 14:10:17 +0000 (UTC) Received: from newone.lan (unknown [10.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ixit.cz (Postfix) with ESMTPSA id AD3B0161B3F; Fri, 24 Feb 2023 15:04:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ixit.cz; s=dkim; t=1677247478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=7ekmKaUSZUGiHSnrych0SWOvyNHZbcMRwNgs+xaEqa4=; b=ZuRq0uM/XBq6A2d+SgT8jCJ7QsedUvJ1miiPmzYmEl+vURbGtHwBe8/Hdom1ZgnCDYFlCD q2a7LpnYmq9MEzwpDFC1NOMxjPdC8k6cVOE0XEBbI3GT0Y6n+0e3z6jjQn0P4waCZ+69NL SmaoaA8zlzg30apMVncY2n/pRdh48F0= From: David Heidelberg To: Subject: [RESEND PATCH] init/do_mounts.c: add virtiofs root fs support Date: Fri, 24 Feb 2023 15:04:21 +0100 Message-Id: <20230224140421.29774-1-david@ixit.cz> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Heidelberg , helen.koike@collabora.com, Stefan Hajnoczi , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Stefan Hajnoczi Make it possible to boot directly from a virtiofs file system with tag 'myfs' using the following kernel parameters: rootfstype=virtiofs root=myfs rw Booting directly from virtiofs makes it possible to use a directory on the host as the root file system. This is convenient for testing and situations where manipulating disk image files is cumbersome. Signed-off-by: Stefan Hajnoczi Signed-off-by: David Heidelberg Reviewed-by: Helen Koike --- We have used this option in Mesa3D CI for testing crosvm for more than one years and it's proven to work reliably. We are working on effort to removing custom patches to be able to do automated apply and test of patches from any tree. https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/.gitlab-ci/crosvm-runner.sh#L85 init/do_mounts.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/init/do_mounts.c b/init/do_mounts.c index 811e94daf0a8..11c11abe23d7 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -578,6 +578,16 @@ void __init mount_root(void) printk(KERN_ERR "VFS: Unable to mount root fs via SMB.\n"); return; } +#endif +#ifdef CONFIG_VIRTIO_FS + if (root_fs_names && !strcmp(root_fs_names, "virtiofs")) { + if (!do_mount_root(root_device_name, "virtiofs", + root_mountflags, root_mount_data)) + return; + + panic("VFS: Unable to mount root fs \"%s\" from virtiofs", + root_device_name); + } #endif if (ROOT_DEV == 0 && root_device_name && root_fs_names) { if (mount_nodev_root() == 0)