Revert msize related commits (#147180)
This commit is contained in:
parent
fb763114e0
commit
c4851c0d71
@ -306,7 +306,7 @@ in
|
|||||||
virtualisation.msize =
|
virtualisation.msize =
|
||||||
mkOption {
|
mkOption {
|
||||||
type = types.ints.positive;
|
type = types.ints.positive;
|
||||||
default = pkgs.vmTools.default9PMsizeBytes;
|
default = 16384;
|
||||||
description =
|
description =
|
||||||
''
|
''
|
||||||
The msize (maximum packet size) option passed to 9p file systems, in
|
The msize (maximum packet size) option passed to 9p file systems, in
|
||||||
|
@ -51,7 +51,6 @@ in makeTest {
|
|||||||
connect-timeout = 1
|
connect-timeout = 1
|
||||||
'';
|
'';
|
||||||
|
|
||||||
virtualisation.memorySize = 2048;
|
|
||||||
virtualisation.diskSize = 8 * 1024;
|
virtualisation.diskSize = 8 * 1024;
|
||||||
virtualisation.emptyDiskImages = [
|
virtualisation.emptyDiskImages = [
|
||||||
# Small root disk for installer
|
# Small root disk for installer
|
||||||
|
@ -76,8 +76,8 @@ let
|
|||||||
def assemble_qemu_flags():
|
def assemble_qemu_flags():
|
||||||
flags = "-cpu max"
|
flags = "-cpu max"
|
||||||
${if (system == "x86_64-linux" || system == "i686-linux")
|
${if (system == "x86_64-linux" || system == "i686-linux")
|
||||||
then ''flags += " -m 1500"''
|
then ''flags += " -m 1024"''
|
||||||
else ''flags += " -m 1000 -enable-kvm -machine virt,gic-version=host"''
|
else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"''
|
||||||
}
|
}
|
||||||
return flags
|
return flags
|
||||||
|
|
||||||
@ -288,7 +288,7 @@ let
|
|||||||
# builds stuff in the VM, needs more juice
|
# builds stuff in the VM, needs more juice
|
||||||
virtualisation.diskSize = 8 * 1024;
|
virtualisation.diskSize = 8 * 1024;
|
||||||
virtualisation.cores = 8;
|
virtualisation.cores = 8;
|
||||||
virtualisation.memorySize = 3096;
|
virtualisation.memorySize = 1536;
|
||||||
|
|
||||||
# Use a small /dev/vdb as the root disk for the
|
# Use a small /dev/vdb as the root disk for the
|
||||||
# installer. This ensures the target disk (/dev/vda) is
|
# installer. This ensures the target disk (/dev/vda) is
|
||||||
|
@ -110,7 +110,7 @@ rec {
|
|||||||
|
|
||||||
echo "mounting Nix store..."
|
echo "mounting Nix store..."
|
||||||
mkdir -p /fs${storeDir}
|
mkdir -p /fs${storeDir}
|
||||||
mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose,msize=${toString default9PMsizeBytes}
|
mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose
|
||||||
|
|
||||||
mkdir -p /fs/tmp /fs/run /fs/var
|
mkdir -p /fs/tmp /fs/run /fs/var
|
||||||
mount -t tmpfs -o "mode=1777" none /fs/tmp
|
mount -t tmpfs -o "mode=1777" none /fs/tmp
|
||||||
@ -119,7 +119,7 @@ rec {
|
|||||||
|
|
||||||
echo "mounting host's temporary directory..."
|
echo "mounting host's temporary directory..."
|
||||||
mkdir -p /fs/tmp/xchg
|
mkdir -p /fs/tmp/xchg
|
||||||
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=${toString default9PMsizeBytes}
|
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L
|
||||||
|
|
||||||
mkdir -p /fs/proc
|
mkdir -p /fs/proc
|
||||||
mount -t proc none /fs/proc
|
mount -t proc none /fs/proc
|
||||||
@ -1174,11 +1174,4 @@ rec {
|
|||||||
`debDistros' sets. */
|
`debDistros' sets. */
|
||||||
diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns;
|
diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns;
|
||||||
|
|
||||||
# The default 9P msize value is 8 KiB, which according to QEMU is
|
|
||||||
# insufficient and would degrade performance.
|
|
||||||
# See: https://wiki.qemu.org/Documentation/9psetup#msize
|
|
||||||
# Use 128KiB which is the default in linux 5.15+
|
|
||||||
# https://github.com/torvalds/linux/commit/9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe
|
|
||||||
# TODO: actually set it to 128KiB, it was causing failures in many tests due to memory usage
|
|
||||||
default9PMsizeBytes = 16 * 1024;
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user