mirror of
https://github.com/gensokyo-zone/infrastructure.git
synced 2026-02-09 12:29:19 -08:00
further i3 configration, VFIO overhaul
This commit is contained in:
kat witch
parent
29c6d142f8
commit
9dbef76fad
GPG key ID:
465E64DECEA8CF0F
15 changed files with 542 additions and 90 deletions
|
|
@ -193,17 +193,84 @@
|
|||
'';
|
||||
|
||||
services.xserver= {
|
||||
xrandrHeads = [
|
||||
{
|
||||
output = "HDMI-A-0";
|
||||
primary = true;
|
||||
}
|
||||
];
|
||||
extraConfig = ''
|
||||
Section "Monitor"
|
||||
Identifier "DisplayPort-0"
|
||||
Option "PreferredMode" "1920x1080"
|
||||
Option "Position" "0 0"
|
||||
EndSection
|
||||
Section "Monitor"
|
||||
Identifier "HDMI-A-0"
|
||||
Option "Primary" "true"
|
||||
Option "PreferredMode" "1920x1080"
|
||||
Option "Position" "1920 0"
|
||||
EndSection
|
||||
Section "Monitor"
|
||||
Identifier "DVI-D-0"
|
||||
Option "PreferredMode" "1920x1200"
|
||||
Option "Position" "3840 0"
|
||||
EndSection
|
||||
'';
|
||||
deviceSection = ''
|
||||
Option "monitor-HDMI-A-0" "HDMI-A-0"
|
||||
Option "monitor-DisplayPort-0" "DisplayPort-0"
|
||||
Option "monitor-DVI-D-0" "DVI-D-0"
|
||||
BusID "PCI:37:0:0"
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
environment.etc = {
|
||||
"sensors3.conf".text = ''
|
||||
chip "nct6797-isa-0a20"
|
||||
label in0 "Vcore"
|
||||
label in1 "+5V"
|
||||
compute in1 5*@, @/5
|
||||
label in2 "AVCC"
|
||||
set in2_min 3.3 * 0.90
|
||||
set in2_max 3.3 * 1.10
|
||||
label in3 "+3.3V"
|
||||
set in3_min 3.3 * 0.90
|
||||
set in3_max 3.3 * 1.10
|
||||
label in4 "+12V"
|
||||
compute in4 12*@, @/12
|
||||
label in5 "DIMM"
|
||||
compute in5 (8+18/19)*@, @/(8+18/19)
|
||||
# label in6 "wtf?" # can't find this in hwinfo64?
|
||||
label in7 "3VSB"
|
||||
set in7_min 3.3 * 0.90
|
||||
set in7_max 3.3 * 1.10
|
||||
label in8 "Vbat"
|
||||
set in8_min 3.3 * 0.90
|
||||
set in8_max 3.3 * 1.10
|
||||
label in9 "VTT"
|
||||
ignore in10 # always zero
|
||||
# label in11 "VIN4" # on hwinfo64
|
||||
label in12 "SoC" # "CPU NB" on hwinfo64
|
||||
# label in13 "VIN6" # on hwinfo64
|
||||
# label in13 "VIN7" # on hwinfo64
|
||||
label fan1 "Rear Fan" # "Pump Fan"
|
||||
label fan2 "CPU Fan"
|
||||
label fan3 "Top Exhaust" # "Case Fan 1"
|
||||
label fan4 "Front Fan" # "Case Fan 2"
|
||||
label fan5 "Top Intake" # "Case Fan 3"
|
||||
label fan6 "Front Fan" # "Case Fan 4"
|
||||
label temp7 "Core"
|
||||
label temp1 "Motherboard"
|
||||
label temp2 "CPU"
|
||||
label temp3 "System" # Auxillary
|
||||
ignore temp4
|
||||
ignore temp6
|
||||
ignore temp8
|
||||
ignore temp9
|
||||
ignore temp10
|
||||
ignore intrusion0
|
||||
ignore intrusion1
|
||||
ignore beep_enable
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
networking = {
|
||||
hostId = "617050fc";
|
||||
useDHCP = false;
|
||||
|
|
@ -218,6 +285,111 @@
|
|||
firewall.allowPing = true;
|
||||
};
|
||||
|
||||
/* boot.kernel.sysctl = let
|
||||
nct = ".//.//.sys.devices.platform.nct6775/2592.hwmon.hwmon1";
|
||||
in {
|
||||
# rear exhaust
|
||||
#"${nct}.pwm1_mode" = 0;
|
||||
"${nct}.pwm1_temp_sel" = 2;
|
||||
"${nct}.pwm1_enable" = 5;
|
||||
"${nct}.pwm1_auto_point1_temp" = 35000;
|
||||
"${nct}.pwm1_auto_point1_pwm" = 88;
|
||||
"${nct}.pwm1_auto_point2_temp" = 38000;
|
||||
"${nct}.pwm1_auto_point2_pwm" = 104;
|
||||
"${nct}.pwm1_auto_point3_temp" = 47000;
|
||||
"${nct}.pwm1_auto_point3_pwm" = 144;
|
||||
"${nct}.pwm1_auto_point4_temp" = 49000;
|
||||
"${nct}.pwm1_auto_point4_pwm" = 224;
|
||||
"${nct}.pwm1_auto_point5_temp" = 52000;
|
||||
"${nct}.pwm1_auto_point5_pwm" = 255;
|
||||
"${nct}.pwm1_step_up_time" = 150;
|
||||
"${nct}.pwm1_step_down_time" = 150;
|
||||
|
||||
# cpu fan
|
||||
#${nct}.pwm2_mode=0
|
||||
"${nct}.pwm2_temp_sel" = 2;
|
||||
"${nct}.pwm2_enable" = 5;
|
||||
"${nct}.pwm2_auto_point1_temp" = 34000;
|
||||
"${nct}.pwm2_auto_point1_pwm" = 0;
|
||||
"${nct}.pwm2_auto_point2_temp" = 34500;
|
||||
"${nct}.pwm2_auto_point2_pwm" = 128;
|
||||
"${nct}.pwm2_auto_point3_temp" = 47000;
|
||||
"${nct}.pwm2_auto_point3_pwm" = 160;
|
||||
"${nct}.pwm2_auto_point4_temp" = 49000;
|
||||
"${nct}.pwm2_auto_point4_pwm" = 224;
|
||||
"${nct}.pwm2_auto_point5_temp" = 52000;
|
||||
"${nct}.pwm2_auto_point5_pwm" = 255;
|
||||
"${nct}.pwm2_step_up_time" = 50;
|
||||
"${nct}.pwm2_step_down_time" = 50;
|
||||
|
||||
# top exhaust
|
||||
#"${nct}.pwm3_mode" = 0;
|
||||
"${nct}.pwm3_temp_sel" = 2;
|
||||
"${nct}.pwm3_enable" = 5;
|
||||
"${nct}.pwm3_auto_point1_temp" = 36000;
|
||||
"${nct}.pwm3_auto_point1_pwm" = 0;
|
||||
"${nct}.pwm3_auto_point2_temp" = 39000;
|
||||
"${nct}.pwm3_auto_point2_pwm" = 136;
|
||||
"${nct}.pwm3_auto_point3_temp" = 48000;
|
||||
"${nct}.pwm3_auto_point3_pwm" = 144;
|
||||
"${nct}.pwm3_auto_point4_temp" = 50000;
|
||||
"${nct}.pwm3_auto_point4_pwm" = 176;
|
||||
"${nct}.pwm3_auto_point5_temp" = 53000;
|
||||
"${nct}.pwm3_auto_point5_pwm" = 255;
|
||||
"${nct}.pwm3_step_up_time" = 100;
|
||||
"${nct}.pwm3_step_down_time" = 100;
|
||||
|
||||
# front 1
|
||||
#"${nct}.pwm4_mode" = 0;
|
||||
"${nct}.pwm4_temp_sel" = 2;
|
||||
"${nct}.pwm4_enable" = 5;
|
||||
"${nct}.pwm4_auto_point1_temp" = 35000;
|
||||
"${nct}.pwm4_auto_point1_pwm" = 104;
|
||||
"${nct}.pwm4_auto_point2_temp" = 38000;
|
||||
"${nct}.pwm4_auto_point2_pwm" = 176;
|
||||
"${nct}.pwm4_auto_point3_temp" = 47000;
|
||||
"${nct}.pwm4_auto_point3_pwm" = 192;
|
||||
"${nct}.pwm4_auto_point4_temp" = 49000;
|
||||
"${nct}.pwm4_auto_point4_pwm" = 224;
|
||||
"${nct}.pwm4_auto_point5_temp" = 52000;
|
||||
"${nct}.pwm4_auto_point5_pwm" = 255;
|
||||
"${nct}.pwm4_step_up_time" = 100;
|
||||
"${nct}.pwm4_step_down_time" = 100;
|
||||
|
||||
# top intake
|
||||
#"${nct}.pwm5_mode" = 0;
|
||||
"${nct}.pwm5_temp_sel" = 2;
|
||||
"${nct}.pwm5_enable" = 5;
|
||||
"${nct}.pwm5_auto_point1_temp" = 36000;
|
||||
"${nct}.pwm5_auto_point1_pwm" = 104;
|
||||
"${nct}.pwm5_auto_point2_temp" = 39000;
|
||||
"${nct}.pwm5_auto_point2_pwm" = 144;
|
||||
"${nct}.pwm5_auto_point3_temp" = 48000;
|
||||
"${nct}.pwm5_auto_point3_pwm" = 176;
|
||||
"${nct}.pwm5_auto_point4_temp" = 50000;
|
||||
"${nct}.pwm5_auto_point4_pwm" = 208;
|
||||
"${nct}.pwm5_auto_point5_temp" = 53000;
|
||||
"${nct}.pwm5_auto_point5_pwm" = 255;
|
||||
"${nct}.pwm5_step_up_time" = 100;
|
||||
"${nct}.pwm5_step_down_time" = 100;
|
||||
|
||||
# front 2
|
||||
#"${nct}.pwm6_mode" = 0;
|
||||
"${nct}.pwm6_temp_sel" = 2;
|
||||
"${nct}.pwm6_enable" = 5;
|
||||
"${nct}.pwm6_auto_point1_temp" = 35000;
|
||||
"${nct}.pwm6_auto_point1_pwm" = 104;
|
||||
"${nct}.pwm6_auto_point2_temp" = 38000;
|
||||
"${nct}.pwm6_auto_point2_pwm" = 176;
|
||||
"${nct}.pwm6_auto_point3_temp" = 47000;
|
||||
"${nct}.pwm6_auto_point3_pwm" = 192;
|
||||
"${nct}.pwm6_auto_point4_temp" = 49000;
|
||||
"${nct}.pwm6_auto_point4_pwm" = 224;
|
||||
"${nct}.pwm6_auto_point5_temp" = 52000;
|
||||
"${nct}.pwm6_auto_point5_pwm" = 255;
|
||||
"${nct}.pwm6_step_up_time" = 100;
|
||||
"${nct}.pwm6_step_down_time" = 100;
|
||||
}; */
|
||||
/*systemd.network = {
|
||||
networks.enp34s0 = {
|
||||
matchConfig.Name = "enp34s0";
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
};
|
||||
};
|
||||
polybarExtend = { config, ... }: {
|
||||
services.polybar.settings."module/temp".hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon2/temp2_input";
|
||||
services.polybar.settings."module/temp".hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon2/temp1_input";
|
||||
};
|
||||
/*
|
||||
polybarExtend2 = { config, ... }: {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,34 @@
|
|||
{ config, pkgs, lib, ... }: with lib; let
|
||||
screenstubConfig = let
|
||||
jsonConfig = builtins.toJSON {
|
||||
win10-toggler = pkgs.writeShellScriptBin "win10-toggle" ''
|
||||
if systemctl --user is-active konawall-rotation.timer --quiet; then
|
||||
systemctl --user stop konawall-rotation.timer
|
||||
else
|
||||
systemctl --user start konawall-rotation.timer
|
||||
fi
|
||||
sudo win10-vm-pinning $(cat $XDG_RUNTIME_DIR/win10-vm.pid)
|
||||
'';
|
||||
win10-start-pane = pkgs.writeShellScriptBin "win10-start-pane" ''
|
||||
sudo disk-mapper-part /dev/disk/by-id/ata-ST2000DM008-2FR102_WK301C3H-part2
|
||||
sudo chown kat:users /dev/mapper/ata-ST2000DM008-2FR102_WK301C3H-part2
|
||||
echo 3 | sudo tee /proc/sys/vm/drop_caches > /dev/null || true; echo 1 | sudo tee /proc/sys/vm/compact_memory > /dev/null || true
|
||||
win10-vm -pidfile $XDG_RUNTIME_DIR/win10-vm.pid
|
||||
'';
|
||||
win10-start = pkgs.writeShellScriptBin "win10-start" ''
|
||||
tmux new-session -ds vm "${win10-start-pane}/bin/win10-start-pane" \; split-window -h 'sleep 10; screenstub x'
|
||||
'';
|
||||
in {
|
||||
options.home-manager.users = let
|
||||
userVFIOExtend = { config, ... }: {
|
||||
config = mkMerge [
|
||||
(mkIf config.wayland.windowManager.sway.enable {
|
||||
wayland.windowManager.sway.config.input = mapListToAttrs (t:
|
||||
nameValuePair "5824:1503:screenstub-${t}" ({ events = "disabled"; })
|
||||
) [ "tablet" "mouse" "kbd" ];
|
||||
})
|
||||
{
|
||||
programs.screenstub = {
|
||||
enable = true;
|
||||
settings = {
|
||||
exit_events = [ "show_host" ];
|
||||
hotkeys = [
|
||||
{
|
||||
|
|
@ -54,23 +82,11 @@
|
|||
model = "BenQ GW2270";
|
||||
};
|
||||
}];
|
||||
}; in pkgs.writeText "screenstub.json" jsonConfig;
|
||||
win10-screenstub = pkgs.writeShellScriptBin "win10-screenstub" ''
|
||||
${pkgs.screenstub}/bin/screenstub -c "${screenstubConfig}" x
|
||||
'';
|
||||
win10-diskmapper = pkgs.writeShellScriptBin "win10-diskmapper" ''
|
||||
sudo ${pkgs.disk-mapper}/bin/disk-mapper /dev/disk/by-id/ata-ST2000DM008-2FR102_WK301C3H-part2
|
||||
'';
|
||||
in
|
||||
{
|
||||
options.home-manager.users = let
|
||||
userVFIOExtend = { config, ... }: {
|
||||
config = mkIf config.wayland.windowManager.sway.enable {
|
||||
wayland.windowManager.sway.config.input = mapListToAttrs (t:
|
||||
nameValuePair "5824:1503:screenstub-${t}" ({ events = "disabled"; })
|
||||
) [ "tablet" "mouse" "kbd" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
in mkOption {
|
||||
type = types.attrsOf (types.submoduleWith {
|
||||
modules = singleton userVFIOExtend;
|
||||
|
|
@ -81,12 +97,54 @@ in
|
|||
deploy.profile.vfio = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
win10-screenstub
|
||||
win10-vm
|
||||
win10-diskmapper
|
||||
win10-toggler
|
||||
vfio-vm
|
||||
vfio-vm-pinning
|
||||
vfio-disk-mapper
|
||||
win10-start
|
||||
ddcutil
|
||||
];
|
||||
|
||||
systemd.mounts = let
|
||||
hugepages = { where, options }: {
|
||||
before = ["sysinit.target"];
|
||||
unitConfig = {
|
||||
DefaultDependencies = "no";
|
||||
ConditionPathExists = "/sys/kernel/mm/hugepages";
|
||||
ConditionCapability = "CAP_SYS_ADMIN";
|
||||
ConditionVirtualization = "!private-users";
|
||||
};
|
||||
what = "hugetlbfs";
|
||||
inherit where options;
|
||||
type = "hugetlbfs";
|
||||
mountConfig = {
|
||||
Group = "vfio";
|
||||
};
|
||||
wantedBy = ["sysinit.target"];
|
||||
};
|
||||
cpuset = {
|
||||
type = "cgroup";
|
||||
what = "cpuset";
|
||||
where = "/sys/fs/cgroup/cpuset";
|
||||
wantedBy = singleton "multi-user.target";
|
||||
options = "cpuset";
|
||||
};
|
||||
in [
|
||||
cpuset
|
||||
(hugepages { where = "/dev/hugepages"; options = "mode=0775"; })
|
||||
(hugepages { where = "/dev/hugepages1G"; options = "pagesize=1GB,mode=0775"; })
|
||||
];
|
||||
|
||||
systemd.services.preallocate-huggies = {
|
||||
wantedBy = singleton "multi-user.target";
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
};
|
||||
script = ''
|
||||
echo 12 > /sys/kernel/mm/hugepages/hugepages-1048576kB/nr_hugepages
|
||||
'';
|
||||
};
|
||||
|
||||
users.groups = { uinput = { }; vfio = { }; };
|
||||
|
||||
boot = lib.mkMerge [{
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit fc7a2a7dea6f067bb3038ac01454030085b55097
|
||||
Subproject commit ab39c7fb9a3bb8250abbce9b66a1ede088919f12
|
||||
|
|
@ -18,6 +18,7 @@
|
|||
mouse_middle_click = "context";
|
||||
mouse_left_click = "close_current";
|
||||
show_indicators = false;
|
||||
fullscreen = "pushback"; # default is to "show"
|
||||
#dmenu = "${config.programs.dmenu.package}/bin/dmenu";
|
||||
dmenu = "${config.programs.rofi.package}/bin/rofi";
|
||||
browser = "${pkgs.xdg-utils}/bin/xdg-open";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,12 @@
|
|||
{ config, base16, pkgs, lib, ... }: with lib;
|
||||
|
||||
{
|
||||
programs.zsh.loginExtra = ''
|
||||
if [[ -z "''${TMUX-}" && -z "''${DISPLAY-}" && "''${XDG_VTNR-}" = 1 && $(${pkgs.coreutils}/bin/id -u) != 0 ]]; then
|
||||
${pkgs.xorg.xinit}/bin/startx
|
||||
fi
|
||||
'';
|
||||
|
||||
services.i3gopher = { enable = true; };
|
||||
|
||||
home.file.".xinitrc".text = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ config, base16, lib, pkgs, ... }: with lib; {
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
terminal = "${pkgs.kitty}/bin/kitty";
|
||||
font = "${config.kw.theme.font.name} 9";
|
||||
theme = let
|
||||
# Use `mkLiteral` for string-like values that should show without
|
||||
|
|
|
|||
6
flake.lock
generated
6
flake.lock
generated
|
|
@ -297,11 +297,11 @@
|
|||
"katexprs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1641325835,
|
||||
"narHash": "sha256-q5T6OBQWdc5QrwWJAcoCbpdWHF75EofHrHrdyoXSqhY=",
|
||||
"lastModified": 1641402064,
|
||||
"narHash": "sha256-YwyYTkZqBgM/SKxu5rLGcL67NqHaTI/mUzvYaYtHN/M=",
|
||||
"owner": "kittywitch",
|
||||
"repo": "nixexprs",
|
||||
"rev": "a90f47f9cd9dacd1a878189781ad92887d67025f",
|
||||
"rev": "706856839b5d1bbe4b1f9ba32842ce86dd21989c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
(import inputs.emacs-overlay)
|
||||
(import ./rustfmt)
|
||||
(import ./dns { inherit inputs; })
|
||||
(import ./local.nix)
|
||||
(import ./local)
|
||||
] ++ (map (path: import "${path}/overlay.nix") [
|
||||
inputs.arcexprs
|
||||
inputs.katexprs
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
final: prev: {
|
||||
vips = prev.vips.override { libjxl = null; };
|
||||
|
||||
kat-hugosite = final.callPackage ./kat-hugosite {};
|
||||
}
|
||||
7
overlays/local/default.nix
Normal file
7
overlays/local/default.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
final: prev: {
|
||||
vips = prev.vips.override { libjxl = null; };
|
||||
kat-hugosite = final.callPackage ./kat-hugosite.nix { };
|
||||
vfio-vm = final.callPackage ./vm.nix { };
|
||||
vfio-vm-pinning = final.callPackage ./vm-pinning.nix { };
|
||||
vfio-disk-mapper = final.callPackage ./disk-mapper.nix { };
|
||||
}
|
||||
46
overlays/local/disk-mapper.nix
Normal file
46
overlays/local/disk-mapper.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ pkgs, writeShellScriptBin }:
|
||||
|
||||
writeShellScriptBin "disk-mapper-part" ''
|
||||
set -x
|
||||
DISK=$1
|
||||
DM_NAME=$(basename $DISK)
|
||||
if [[ ! -e /dev/mapper/$DM_NAME ]]; then
|
||||
DISK_ID=''${2-$(printf %s "$DM_NAME" | sha256sum)}
|
||||
DISK_TYPE=7 # NTFS
|
||||
MBR_FILE=$(mktemp -t vm-$DM_NAME-XXXXXXXX.mbr)
|
||||
BLOCK=$(basename $(readlink $DISK))
|
||||
BLOCK_START=$(cat /sys/class/block/$BLOCK/start)
|
||||
BLOCK_SIZE=$(cat /sys/class/block/$BLOCK/size)
|
||||
DISK_SIZE=$(((BLOCK_SIZE + 2048 + 2047) / 2048 * 2048))
|
||||
dd if=/dev/zero of=$MBR_FILE bs=512 count=2048 status=none
|
||||
|
||||
LDEV=$(losetup --show -f $MBR_FILE)
|
||||
END_GUARD=$((DISK_SIZE - 2048 - BLOCK_SIZE))
|
||||
if [[ $END_GUARD -ne 0 ]]; then
|
||||
END_GUARD="$((BLOCK_SIZE + 2048)) $END_GUARD zero"
|
||||
else
|
||||
END_GUARD=
|
||||
fi
|
||||
dmsetup create $DM_NAME <<EOF
|
||||
0 2048 linear $LDEV 0
|
||||
2048 $BLOCK_SIZE linear $DISK 0
|
||||
$END_GUARD
|
||||
EOF
|
||||
CYL=$((DISK_SIZE / 2048))
|
||||
if [[ $CYL -gt 65535 ]]; then
|
||||
CYL=65535
|
||||
fi
|
||||
dmsetup setgeometry $DM_NAME $CYL 64 32 0
|
||||
chown "$USER" /dev/mapper/$DM_NAME
|
||||
sfdisk --quiet --no-tell-kernel --no-reread /dev/mapper/$DM_NAME <<EOF
|
||||
label: dos
|
||||
label-id: 0x''${DISK_ID:8}
|
||||
device: $DM_NAME
|
||||
unit: sectors
|
||||
grain: 512
|
||||
sector-size: 512
|
||||
|
||||
1 : start=2048, size=$BLOCK_SIZE, type=$DISK_TYPE
|
||||
EOF
|
||||
fi
|
||||
''
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
src = fetchFromGitHub {
|
||||
owner = "kittywitch";
|
||||
repo = "hugosite";
|
||||
rev = "20d0b6cfa15956d8f411104291f5e47995b433d8";
|
||||
sha256 = "sha256-su3ey8FwTYyR1XP/hqsnsfh21JmSYO16wLRNIJx3zKs=";
|
||||
rev = "ee2bdd87dd5f6a59234f7102dea8189d22048a4c";
|
||||
sha256 = "sha256-j/fRTm5GIXmtmsdOBF2ILyYFCN+j39Ul5/kB2OoDQt4=";
|
||||
};
|
||||
buildPhase = ''
|
||||
${hugo}/bin/hugo
|
||||
79
overlays/local/vm-pinning.nix
Normal file
79
overlays/local/vm-pinning.nix
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
{ pkgs, writeShellScriptBin }:
|
||||
|
||||
writeShellScriptBin "win10-vm-pinning" ''
|
||||
set -eu
|
||||
|
||||
CPUSET=/sys/fs/cgroup/cpuset
|
||||
#CPUSET=/dev/cpuset
|
||||
|
||||
cpuset_move() {
|
||||
local FROM=$1
|
||||
local TO=$2
|
||||
for proc in $(cat $CPUSET/$FROM/tasks); do
|
||||
echo $proc > $CPUSET/$TO/tasks || true
|
||||
done 2> /dev/null
|
||||
}
|
||||
|
||||
echo 1 > $CPUSET/cpuset.sched_load_balance
|
||||
|
||||
if [[ ! -d $CPUSET/qemu ]]; then
|
||||
mkdir $CPUSET/qemu
|
||||
echo 0 > $CPUSET/qemu/cpuset.sched_load_balance
|
||||
fi
|
||||
|
||||
if [[ ! -d $CPUSET/system ]]; then
|
||||
mkdir $CPUSET/system
|
||||
echo 1 > $CPUSET/system/cpuset.sched_load_balance
|
||||
fi
|
||||
|
||||
cpuset_move qemu .
|
||||
cpuset_move system .
|
||||
|
||||
echo "" > $CPUSET/qemu/cpuset.cpus
|
||||
|
||||
if [[ $# -lt 1 ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
QEMU_PID=$1
|
||||
shift
|
||||
|
||||
echo "0-1,6-7" > $CPUSET/system/cpuset.cpus
|
||||
cat < $CPUSET/cpuset.mems > $CPUSET/system/cpuset.mems
|
||||
cat < $CPUSET/cpuset.mems > $CPUSET/qemu/cpuset.mems
|
||||
|
||||
echo "2-5,8-11" > $CPUSET/qemu/cpuset.cpus
|
||||
#echo "1-3,5-7" > $CPUSET/qemu/cpuset.cpus
|
||||
#echo "0,1,2" > $CPUSET/qemu/cpuset.cpus
|
||||
|
||||
cpuset_move . system
|
||||
|
||||
echo 1 > $CPUSET/qemu/cpuset.cpu_exclusive
|
||||
|
||||
for task in /proc/$QEMU_PID/task/*; do
|
||||
TASKNAME=$(grep -F "Name:" $task/status | cut -d $'\t' -f2)
|
||||
TASK=$(basename $task)
|
||||
|
||||
case $TASKNAME in
|
||||
worker | qemu-system-*)
|
||||
echo worker is $TASKNAME
|
||||
;;
|
||||
CPU*)
|
||||
regex="CPU ([0-9]*)/KVM"
|
||||
if [[ $TASKNAME =~ $regex ]]; then
|
||||
CPU_ID=''${BASH_REMATCH[1]}
|
||||
echo $TASK > $CPUSET/qemu/tasks
|
||||
CPU_PIN=$((CPU_ID / 2 + (CPU_ID % 2) * 6 + 2))
|
||||
#CPU_PIN=$((CPU_ID * 2))
|
||||
taskset -p --cpu-list $CPU_PIN $TASK
|
||||
else
|
||||
echo unknown CPU $TASKNAME
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo unknown task $TASKNAME
|
||||
;;
|
||||
esac
|
||||
done
|
||||
''
|
||||
87
overlays/local/vm.nix
Normal file
87
overlays/local/vm.nix
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
{ pkgs, writeShellScriptBin }:
|
||||
|
||||
writeShellScriptBin "win10-vm" ''
|
||||
cat ${pkgs.OVMF.fd}/FV/OVMF_VARS.fd > /tmp/OVMF_VARS.fd
|
||||
exec chrt -f 1 ${pkgs.qemu-vfio}/bin/qemu-system-x86_64 -name guest=win10,debug-threads=on \
|
||||
-blockdev '{"driver":"file","filename":"${pkgs.OVMF.fd}/FV/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
|
||||
-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
|
||||
-blockdev '{"driver":"file","filename":"/tmp/OVMF_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
|
||||
-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
|
||||
-machine pc-q35-5.1,accel=kvm,usb=off,vmport=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
|
||||
-monitor stdio \
|
||||
-cpu host,migratable=no,+invtsc,topoext=on,hv-time,hv-relaxed,hv-vapic,-amd-stibp,,hv-synic,hv-spinlocks=0x1fff,host-cache-info=on,l3-cache=off -m 12288 \
|
||||
-mem-path /dev/hugepages1G/qemu-win10-vm -mem-prealloc \
|
||||
-smp 8,sockets=1,dies=1,cores=4,threads=2 \
|
||||
-object iothread,id=iothread1 -uuid 96052919-6a83-4e9f-8e9b-628de3e27cc1 \
|
||||
-display none \
|
||||
-no-user-config \
|
||||
-nodefaults \
|
||||
-rtc base=localtime,driftfix=slew -global kvm-pit.lost_tick_policy=delay \
|
||||
-no-hpet -no-shutdown \
|
||||
-global ICH9-LPC.disable_s3=1 \
|
||||
-global ICH9-LPC.disable_s4=1 \
|
||||
-boot strict=on \
|
||||
-device pcie-root-port,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
|
||||
-device pcie-root-port,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
|
||||
-device pcie-root-port,port=0x12,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
|
||||
-device pcie-root-port,port=0x13,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x3 \
|
||||
-device pcie-root-port,port=0x14,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x4 \
|
||||
-device pcie-root-port,port=0x15,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x5 \
|
||||
-device pcie-root-port,port=0x16,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x6 \
|
||||
-device pcie-pci-bridge,id=pci.8,bus=pci.4,addr=0x0 \
|
||||
-device pcie-root-port,port=0x17,chassis=9,id=pci.9,bus=pcie.0,addr=0x2.0x7 \
|
||||
-device pcie-root-port,port=0x8,chassis=10,id=pci.10,bus=pcie.0,multifunction=on,addr=0x1 \
|
||||
-device pcie-root-port,port=0xa,chassis=11,id=pci.11,bus=pcie.0,addr=0x1.0x1 \
|
||||
-device pcie-root-port,port=0xa,chassis=12,id=pci.12,bus=pcie.0,addr=0x1.0x2 \
|
||||
-device pcie-root-port,port=0xb,chassis=13,id=pci.13,bus=pcie.0,addr=0x1.0x3 \
|
||||
-device pcie-root-port,port=0xc,chassis=14,id=pci.14,bus=pcie.0,addr=0x1.0x4 \
|
||||
-device pcie-root-port,port=0xd,chassis=15,id=pci.15,bus=pcie.0,addr=0x1.0x5 \
|
||||
-device pcie-root-port,port=0xe,chassis=16,id=pci.16,bus=pcie.0,addr=0x1.0x6 \
|
||||
-device pcie-root-port,port=0xf,chassis=17,id=pci.17,bus=pcie.0,addr=0x1.0x7 \
|
||||
-device pcie-root-port,port=0x18,chassis=18,id=pci.18,bus=pcie.0,multifunction=on,addr=0x3 \
|
||||
-device pcie-root-port,port=0x19,chassis=19,id=pci.19,bus=pcie.0,addr=0x3.0x1 \
|
||||
-device pcie-root-port,port=0x1a,chassis=20,id=pci.20,bus=pcie.0,addr=0x3.0x2 \
|
||||
-device pcie-root-port,port=0x1b,chassis=21,id=pci.21,bus=pcie.0,addr=0x3.0x3 \
|
||||
-device pcie-root-port,port=0x1c,chassis=22,id=pci.22,bus=pcie.0,addr=0x3.0x4 \
|
||||
-device pcie-root-port,port=0x1d,chassis=23,id=pci.23,bus=pcie.0,multifunction=on,addr=0x3.0x5 \
|
||||
-device pcie-pci-bridge,id=pci.24,bus=pci.10,addr=0x0 \
|
||||
-device ich9-usb-ehci1,id=usb -device ich9-usb-uhci1,masterbus=usb.0,firstport=0,multifunction=on -device ich9-usb-uhci2,masterbus=usb.0,firstport=2 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4 \
|
||||
-device qemu-xhci,id=usb3,p2=4,p3=8 \
|
||||
-device virtio-scsi-pci,id=scsi0,bus=pci.6,addr=0x0 \
|
||||
-device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \
|
||||
-device ich9-intel-hda,id=sound0 \
|
||||
-device hda-output,audiodev=pa1 \
|
||||
-device hda-micro,audiodev=pa1 \
|
||||
-audiodev pa,id=pa1,server=/run/user/1000/pulse/native,out.buffer-length=4000,timer-period=1000 \
|
||||
-blockdev '{"driver":"host_device","filename":"/dev/disk/by-id/ata-HFS256G32TNF-N3A0A_MJ8BN15091150BM1Z","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
|
||||
-blockdev '{"node-name":"libvirt-2-format","read-only":false,"discard":"unmap","driver":"raw","file":"libvirt-2-storage"}' \
|
||||
-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,device_id=drive-scsi0-0-0-0,drive=libvirt-2-format,id=scsi0-0-0-0,bootindex=2 \
|
||||
-blockdev '{"driver":"host_device","filename":"/dev/mapper/ata-ST2000DM008-2FR102_WK301C3H-part2","aio":"native","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
|
||||
-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=1,device_id=drive-scsi0-0-0-1,drive=libvirt-1-format,id=scsi0-0-0-1,bootindex=3 \
|
||||
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \
|
||||
-netdev user,id=smbnet0,restrict=no,net=10.1.2.0/24,host=10.1.2.1,smb=/home/kat/shared/,smbserver=10.1.2.2 \
|
||||
-device virtio-net-pci,netdev=smbnet0,id=net1,mac=2b:c6:c4:ac:67:ba \
|
||||
-device vfio-pci,host=0000:29:00.0,id=hostdev0,bus=pci.7,addr=0x0 \
|
||||
-device vfio-pci,host=0000:29:00.1,id=hostdev1,bus=pci.9,addr=0x0 \
|
||||
-device vfio-pci,host=0000:28:00.0,id=hostdev3,bus=pci.11,addr=0x0 \
|
||||
-device vfio-pci,host=0000:2b:00.3,id=hostdev4,bus=pci.19,addr=0x0 \
|
||||
-device virtio-balloon-pci,id=balloon0,bus=pci.5,addr=0x0 \
|
||||
-chardev socket,path=/tmp/vfio-qmp,server,nowait,id=qmp0 \
|
||||
-mon chardev=qmp0,id=qmp,mode=control \
|
||||
-chardev socket,path=/tmp/vfio-qga,server,nowait,id=qga0 \
|
||||
-device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 \
|
||||
-set device.scsi0-0-0-0.rotation_rate=1 \
|
||||
-cpu host,hv_time,kvm=off,hv_vendor_id=null,-hypervisor \
|
||||
-msg timestamp=on "$@"''
|
||||
|
||||
# -device vfio-pci,host=0000:21:00.0,id,addr=0x0 \
|
||||
# -device virtio-net-pci,netdev=hostnet0,id=net0,mac=5b:f2:eb:3c:0b:46 \
|
||||
# -netdev bridge,id=hostnet0,br=br,helper=$(type -P qemu-bridge-helper) \
|
||||
# -vcpu vcpunum=0,affinity=0 \
|
||||
# -vcpu vcpunum=1,affinity=1 \
|
||||
# -vcpu vcpunum=2,affinity=2 \
|
||||
# -vcpu vcpunum=3,affinity=3 \
|
||||
# -vcpu vcpunum=4,affinity=6 \
|
||||
# -vcpu vcpunum=5,affinity=7 \
|
||||
# -vcpu vcpunum=6,affinity=8 \
|
||||
# -vcpu vcpunum=7,affinity=9 \
|
||||
Loading…
Add table
Add a link
Reference in a new issue