Merge branch 'andrew/vsock-upgrade' into 'master'

Vsock upgrade

- Switch VSOCK over to Rust client/server
- Remove old VSOCK code
- Small improvements and fixes to VSOCK code 

See merge request dfinity-lab/public/ic!11448

.gitlab/CODEOWNERS

@@ -128,7 +128,6 @@ go_deps.bzl               @dfinity-lab/teams/idx
 /rs/embedders/                          @dfinity-lab/teams/runtime-owners
 /rs/execution_environment/              @dfinity-lab/teams/execution-owners @dfinity-lab/teams/runtime-owners
 /rs/gitlab-ci-config.yml                @dfinity-lab/teams/idx
-/rs/guestos_vsock_agent/                @dfinity-lab/teams/node-team
 /rs/ic_os/                              @dfinity-lab/teams/node-team
 /rs/http_endpoints/                     @dfinity-lab/teams/networking-team
 /rs/https_outcalls/                     @dfinity-lab/teams/networking-team

Cargo.toml

@@ -108,7 +108,6 @@ members = [
   "rs/embedders",
   "rs/execution_environment",
   "rs/execution_environment/benches/lib",
-  "rs/guestos_vsock_agent",
   "rs/http_endpoints/public",
   "rs/http_endpoints/metrics",
   "rs/http_utils",

gitlab-ci/src/std-fs-check/std-fs-whitelist.txt

@@ -28,7 +28,6 @@ drun/src/message.rs:    fmt,
 drun/src/message.rs:    fs::File,
 drun/src/message.rs:use std::{
 embedders/tests/instrumentation.rs:use std::fs;
-guestos_vsock_agent/src/agent.rs:use std::fs::File;
 http_handler/build.rs:use std::fs::File;
 http_utils/src/file_downloader.rs:use std::fs::{self, File};
 ic_os/vsock/vsock_lib/src/host/agent.rs:use std::fs::{File, OpenOptions, read_to_string};

ic-os/guestos/defs.bzl

@@ -43,7 +43,6 @@ def image_deps(mode, malicious = False):
             "//publish/binaries:sevctl": "/opt/ic/bin/sevctl:0755",
             "@sevtool": "/opt/ic/bin/sevtool:0755",
             "//publish/binaries:state-tool": "/opt/ic/bin/state-tool:0755",
-            "//publish/binaries:vsock_agent": "/opt/ic/bin/vsock_agent:0755",
             "//publish/binaries:vsock_guest": "/opt/ic/bin/vsock_guest:0755",
             "//ic-os/utils:infogetty": "/opt/ic/bin/infogetty:0755",
             "//ic-os/utils:prestorecon": "/opt/ic/bin/prestorecon:0755",

ic-os/hostos/defs.bzl

@@ -31,7 +31,7 @@ def image_deps(mode, _malicious = False):
             ":rootfs-tree.tar": "/",
 
             # additional files to install
-            "//publish/binaries:vsock_host": "/opt/ic/bin/vsock-host:0755",
+            "//publish/binaries:vsock_host": "/opt/ic/bin/vsock_host:0755",
             "//ic-os:scripts/build-bootstrap-config-image.sh": "/opt/ic/bin/build-bootstrap-config-image.sh:0755",
         },
 

ic-os/hostos/rootfs/etc/systemd/system/guestos.service

@@ -9,6 +9,7 @@ After=generate-guestos-config.service
 Type=forking
 ExecStartPre=/opt/ic/bin/detect-first-boot.sh
 ExecStart=/opt/ic/bin/start-guestos.sh
+ExecStartPost=/opt/ic/bin/manageboot.sh confirm
 ExecStop=/opt/ic/bin/stop-guestos.sh
 Restart=on-failure
 PIDFile=/var/run/libvirt/qemu/guestos.pid

ic-os/hostos/rootfs/etc/systemd/system/vsock-agent.service

@@ -1,11 +1,11 @@
 [Unit]
-Description=HSM Agent
+Description=VSOCK agent daemon
 After=syslog.target
 
 [Service]
 User=root
 Group=root
-ExecStart=python3 /opt/ic/bin/hostos-vsock-agent/hostos_vsock_agent.py server --verbose
+ExecStart=/opt/ic/bin/vsock_host
 Restart=always
 RuntimeMaxSec=3600
 RestartSec=10

publish/binaries/BUILD.bazel

@@ -4,7 +4,6 @@ load("//gitlab-ci/src/artifacts:upload.bzl", "upload_artifacts")
 
 LINUX_ONLY = [
     "sevctl",
-    "vsock_agent",
     "vsock_guest",
     "vsock_host",
 ]
@@ -55,7 +54,6 @@ BINARIES = {
     "sns": "//rs/sns/cli:sns",
     "state-tool": "//rs/state_tool:state-tool",
     "vector-config-generator": "//rs/observability/vector_config_generator:vector_config_generator",
-    "vsock_agent": "//rs/guestos_vsock_agent:vsock_agent",
     "vsock_guest": "//rs/ic_os/vsock/guest:vsock_guest",
     "vsock_host": "//rs/ic_os/vsock/host:vsock_host",
 }