From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 Received: by atuin.qyliss.net (Postfix, from userid 496) id 4A8AF7D4E5; Mon, 21 Mar 2022 14:01:59 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 8013F7D4B2; Mon, 21 Mar 2022 14:01:35 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 97EAC7D443; Mon, 21 Mar 2022 14:01:32 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id A554C7D49A for ; Mon, 21 Mar 2022 14:01:28 +0000 (UTC) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id A20FF5C017F for ; Mon, 21 Mar 2022 10:01:27 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 21 Mar 2022 10:01:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; bh=CKf7eecxFBzPmBUaa/aGjR8b2E6j19 dGuaBuXmGjAWg=; b=IG/Jl/OZV7Cf4iNCgqU/JtQwblXHn3z4ZvveXieAahhV0p Kw5CODtEDSjDZBkoH2OLTlYsoo2JDirFR5QHKlNahsfvJ6x2AWN8U7R5IWLcLqGg QFS+PFNP8mEKUTwK8WtEG5WnrGqkCUq/27jFFRilJpB/GLyl1hzE6s7a/FcJcvlR ka1yz/UnkRY3AZFCXPyZruX2vqBGLIoefRXFbL4ZIavd5t4V0BYZsLuzJNuUvpCP 5nOaH40yZPi39LVV5a36p7Olth7/jDYOdDQSfz0A/B087pq3gVpqdCm9Qo/ph099 B0V/YJvIerD3eoJELqnRoLyBgQ8WGuZfvS8qyg8Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=CKf7ee cxFBzPmBUaa/aGjR8b2E6j19dGuaBuXmGjAWg=; b=GPVsMKEiSWUEh9wtAy2k3x +vMwBeBNGgF8C8o1m+s/aLT1w7Ql53tVcZhOXKLodsQteqdKOLYYHVwr0yXWoa52 JRD9lNjLNqwE9yCMdrF6yGL1rOq9mLmM0cgW0MmufRVFmq0braP0x7czX0lNyMFz gzrXq8caYPCixj3+ai4sNuPp6NfFMcAbFWf6+3FFE5yoaNL7Pl2BbETEg5k2X9EH MH3+xGFjPDlSycGgyo6CLFMCLHDsbKiADJ6rfp41+6Xg9n0rERU0X99KEdVDcGmv j9vmqCb3jDxpMWBOSUfwuQ+Di6JPgQX52UwNEWv5s4Kuu5vSd9b2HI8exgZRIlpw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudegfedgheelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepqhihlhhishhssegvvhgvrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 21 Mar 2022 10:01:26 -0400 (EDT) Received: by eve.qyliss.net (Postfix, from userid 1000) id 6BCEC836B; Mon, 21 Mar 2022 14:01:24 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 2/2] host/rootfs: remove unnecessary modprobes Date: Mon, 21 Mar 2022 14:01:07 +0000 Message-Id: <20220321140107.1043654-2-hi@alyssa.is> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220321140107.1043654-1-hi@alyssa.is> References: <20220321140107.1043654-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: RSPU4AH22MBTOQGH62ELKCJOELW7PVMA X-Message-ID-Hash: RSPU4AH22MBTOQGH62ELKCJOELW7PVMA X-MailFrom: qyliss@eve.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Now that we're using a proper modprobe implementation, some of these weird modprobes we shouldn't have needed in the first place can actually be removed. --- host/rootfs/etc/mdev/net/add | 5 +--- host/start-vm/modprobe.rs | 49 ------------------------------------ host/start-vm/start-vm.rs | 4 --- 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 host/start-vm/modprobe.rs diff --git a/host/rootfs/etc/mdev/net/add b/host/rootfs/etc/mdev/net/add index 959d73a..7b282e7 100755 --- a/host/rootfs/etc/mdev/net/add +++ b/host/rootfs/etc/mdev/net/add @@ -5,10 +5,7 @@ # Assign the whole IOMMU group containing this device to the network # VM. -if { - forx -pE module { vfio-pci vfio_iommu_type1 } - modprobe $module -} +if { modprobe vfio-pci } importas -i devpath DEVPATH diff --git a/host/start-vm/modprobe.rs b/host/start-vm/modprobe.rs deleted file mode 100644 index 6186820..0000000 --- a/host/start-vm/modprobe.rs +++ /dev/null @@ -1,49 +0,0 @@ -// SPDX-License-Identifier: EUPL-1.2 -// SPDX-FileCopyrightText: 2022 Alyssa Ross - -use std::ffi::OsStr; -use std::fmt::{self, Display, Formatter}; -use std::io; -use std::os::unix::prelude::*; -use std::process::{Command, ExitStatus}; - -#[derive(Debug)] -pub enum ModprobeError { - Spawn(io::Error), - Fail(ExitStatus), -} - -impl Display for ModprobeError { - fn fmt(&self, f: &mut Formatter) -> fmt::Result { - use ModprobeError::*; - match self { - Spawn(e) => write!(f, "failed to spawn modprobe: {}", e), - Fail(status) => { - if let Some(code) = status.code() { - write!(f, "modprobe exited with status {}", code) - } else { - write!(f, "modprobe killed by signal {}", status.signal().unwrap()) - } - } - } - } -} - -pub fn modprobe(module_names: I) -> Result<(), ModprobeError> -where - I: IntoIterator, - S: AsRef, -{ - let status = Command::new("modprobe") - .arg("-q") - .arg("--") - .args(module_names) - .status() - .map_err(ModprobeError::Spawn)?; - - if status.success() { - Ok(()) - } else { - Err(ModprobeError::Fail(status)) - } -} diff --git a/host/start-vm/start-vm.rs b/host/start-vm/start-vm.rs index becbe5c..0d08eaa 100644 --- a/host/start-vm/start-vm.rs +++ b/host/start-vm/start-vm.rs @@ -2,7 +2,6 @@ // SPDX-FileCopyrightText: 2022 Alyssa Ross mod ch; -mod modprobe; mod net; use std::env::{args, current_dir}; @@ -12,7 +11,6 @@ use std::os::unix::prelude::*; use std::path::PathBuf; use std::process::{exit, Command}; -use modprobe::modprobe; use net::{format_mac, net_setup, NetConfig}; macro_rules! errx { @@ -30,8 +28,6 @@ macro_rules! err { } fn main() { - modprobe(&["kvm-intel"]).unwrap_or_else(err!(1, "modprobe kvm-intel")); - let mut command = Command::new("s6-notifyoncheck"); command.args(&["-dc", "test -S env/cloud-hypervisor.sock"]); command.arg("cloud-hypervisor"); -- 2.35.1