mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/boot): default CH_NUM_CPUS=2, and set num_queues= to it

Browse source 
See https://patchwork.kernel.org/project/qemu-devel/patch/20200706135650.438362-5-stefanha@redhat.com/

Change-Id: I3ba9a1c1f8b0be27f215da6b71cd3a0ded513a75
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11502
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
Florian Klink 2024-04-22 16:53:15 +03:00 committed by clbot
parent ff9e8743f6
commit dc444e55dc
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tvix/boot/default.nix
View file

@ -67,7 +67,7 @@ rec {
# Start a `tvix-store` virtiofs daemon from $PATH, then a cloud-hypervisor # Start a `tvix-store` virtiofs daemon from $PATH, then a cloud-hypervisor
# pointed to it. # pointed to it.
# Supports the following env vars (and defaults) # Supports the following env vars (and defaults)
# CH_NUM_CPUS=1 # CH_NUM_CPUS=2
# CH_MEM_SIZE=512M # CH_MEM_SIZE=512M
# CH_CMDLINE="" # CH_CMDLINE=""
runVM = pkgs.writers.writeBashBin "run-tvix-vm" '' runVM = pkgs.writers.writeBashBin "run-tvix-vm" ''
@ -89,7 +89,7 @@ rec {
# Wait for the socket to exist. # Wait for the socket to exist.
until [ -e $tempdir/tvix.sock ]; do sleep 0.1; done until [ -e $tempdir/tvix.sock ]; do sleep 0.1; done
CH_NUM_CPUS="''${CH_NUM_CPUS:-1}" CH_NUM_CPUS="''${CH_NUM_CPUS:-2}"
CH_MEM_SIZE="''${CH_MEM_SIZE:-512M}" CH_MEM_SIZE="''${CH_MEM_SIZE:-512M}"
CH_CMDLINE="''${CH_CMDLINE:-}" CH_CMDLINE="''${CH_CMDLINE:-}"
@ -102,7 +102,7 @@ rec {
--kernel ${kernel.dev}/vmlinux \ --kernel ${kernel.dev}/vmlinux \
--initramfs ${initrd} \ --initramfs ${initrd} \
--cmdline "console=ttyS0 $CH_CMDLINE" \ --cmdline "console=ttyS0 $CH_CMDLINE" \
--fs tag=tvix,socket=$tempdir/tvix.sock,num_queues=1,queue_size=512 --fs tag=tvix,socket=$tempdir/tvix.sock,num_queues=''${CH_NUM_CPU},queue_size=512
''; '';
meta.ci.targets = [ meta.ci.targets = [