From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 62D90905AE; Mon, 10 Oct 2022 23:33:04 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id DDB70902A2; Mon, 10 Oct 2022 23:32:35 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id CE11E9007A for ; Mon, 10 Oct 2022 23:32:13 +0000 (UTC) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 37F2C5C01B6 for ; Mon, 10 Oct 2022 19:32:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 10 Oct 2022 19:32:10 -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=fm2; t=1665444730; x=1665531130; bh=9G k29QzFC5gEWXt9PoinSO5sk5WzmUikBh4XqPvChJ8=; b=Ns4o32x5F/fqTNhqQU RuTeyKbcCeCKc4TxpAw7SyxiTi1lK1ItAlvRKItTjIH0kNoM05XajTptrdnPZX+2 FYia1PDjrFd+nY+IzqQAkKnemR7UUU6nJLVnsJfg4cuxRr05fXG7UhsucQQJWIW2 V5K/CsYv9orEa2Z/wjRkOrSITGBi2esjUxJ8muaIs33hs3Yg/eUAbceA1jYHmpHv GuRoSuBBPBmzslh7ksf7tou5aTzjvnQb/CdifU5SNmRjvdCEKUL3hSPlqrFvxXi9 +RaGIIarvYq9R6B6BWeBxVPL4027lOSSBm3zxH7bLexe9bHKDTO5Kmi2bqccfZ/I 1BJg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id: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; t=1665444730; x=1665531130; bh=9Gk29QzFC5gEW Xt9PoinSO5sk5WzmUikBh4XqPvChJ8=; b=Sz8KC1Jg/T8Sh+RA2RfmjmVETjkhC UH+JEeUG7aGfHNgTool7IHzMu6Nlp9HxxwfKQTkrUi8jTlhOQvRdNgKgXKjOv5tg QccPq7HLDGvARqJqt5KlqmfrD71u0s5h1O2LewJL+kJsYLdF6F8NswMqoJIxNfZf eKnVWKzPMQyWjgnOfF6N5YHPOlOlHVUlwX+hY+aK+sokO9R3KX6qbEjkTynbnI15 7PFSMrMz7JVZZpv0LcFr8H0QzVoyUfrzBE9urpB4wfga+0hzIdlE2XmCLw3FGe4C oTnS+GTRp+urg3/HWUksBPsfegDEJPOzvwLtdtRRjXaYlhfClC/KrQYJg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejhedgvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 10 Oct 2022 19:32:09 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id EB909CC1; Mon, 10 Oct 2022 23:32:06 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 18/22] host/start-vm: increase memory size to 512M Date: Mon, 10 Oct 2022 23:28:58 +0000 Message-Id: <20221010232909.1953738-19-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221010232909.1953738-1-hi@alyssa.is> References: <20221010232909.1953738-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: LOY6IAR433GKMMUZKYRZOHXQMOXXYXEF X-Message-ID-Hash: LOY6IAR433GKMMUZKYRZOHXQMOXXYXEF X-MailFrom: qyliss@x220.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; header-match-devel.spectrum-os.org-2; 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: To be able to run Nix builds inside a VM, we need more memory. Eventually, of course, we will want to not have a single static memory size for all VMs, but this is fine for now as I have tested all that I can still run all default VMs, plus one running a Nix build, in the test VM with 2G of memory with this change. Signed-off-by: Alyssa Ross --- host/start-vm/lib.rs | 2 +- host/start-vm/tests/vm_command-basic.rs | 2 +- img/app/Makefile | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/host/start-vm/lib.rs b/host/start-vm/lib.rs index f167efe..1946c65 100644 --- a/host/start-vm/lib.rs +++ b/host/start-vm/lib.rs @@ -50,7 +50,7 @@ pub fn vm_command(dir: PathBuf, root: &Root) -> Result { command.arg("cloud-hypervisor"); command.args(&["--api-socket", "env/cloud-hypervisor.sock"]); command.args(&["--cmdline", "console=ttyS0 root=PARTLABEL=root"]); - command.args(&["--memory", "size=128M,shared=on"]); + command.args(&["--memory", "size=512M,shared=on"]); command.args(&["--console", "pty"]); command.arg("--kernel"); diff --git a/host/start-vm/tests/vm_command-basic.rs b/host/start-vm/tests/vm_command-basic.rs index 234f6e3..311c2af 100644 --- a/host/start-vm/tests/vm_command-basic.rs +++ b/host/start-vm/tests/vm_command-basic.rs @@ -39,7 +39,7 @@ fn main() -> std::io::Result<()> { OsStr::new("--cmdline"), OsStr::new("console=ttyS0 root=PARTLABEL=root"), OsStr::new("--memory"), - OsStr::new("size=128M,shared=on"), + OsStr::new("size=512M,shared=on"), OsStr::new("--console"), OsStr::new("pty"), OsStr::new("--kernel"), diff --git a/img/app/Makefile b/img/app/Makefile index 259e819..cb3af71 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -106,7 +106,7 @@ start-virtiofsd: .PHONY: start-virtiofsd run-qemu: build/host/appvm/blk/root.img start-virtiofsd - $(QEMU_KVM) -m 128 -cpu host -machine q35,kernel=$(KERNEL) -vga none \ + $(QEMU_KVM) -m 512 -cpu host -machine q35,kernel=$(KERNEL) -vga none \ -drive file=build/host/appvm/blk/root.img,if=virtio,format=raw,readonly=on \ -drive file=$(RUN_IMG),if=virtio,format=raw,readonly=on \ -append "console=ttyS0 root=PARTLABEL=root" \ @@ -114,7 +114,7 @@ run-qemu: build/host/appvm/blk/root.img start-virtiofsd -device virtio-net,netdev=net0,mac=0A:B3:EC:00:00:00 \ -chardev socket,id=virtiofsd,path=virtiofsd.sock \ -device vhost-user-fs-pci,chardev=virtiofsd,tag=virtiofs0 \ - -object memory-backend-memfd,id=mem,size=128M,share=on \ + -object memory-backend-memfd,id=mem,size=512M,share=on \ -numa node,memdev=mem \ -chardev vc,id=virtiocon0 \ -device virtio-serial-pci \ @@ -124,7 +124,7 @@ run-qemu: build/host/appvm/blk/root.img start-virtiofsd run-cloud-hypervisor: build/host/appvm/blk/root.img start-virtiofsd $(CLOUD_HYPERVISOR) \ --api-socket path=vmm.sock \ - --memory size=128M,shared=on \ + --memory size=512M,shared=on \ --disk path=build/host/appvm/blk/root.img,readonly=on \ path=$(RUN_IMG),readonly=on \ --net tap=tap0,mac=0A:B3:EC:00:00:00 \ -- 2.37.1