do-not-merge: tests/cri-containerd: temporarily use containerd fork with getRuncOptions fix

The cri-containerd integration tests fail with the shim sandboxer when
running non-runc runtimes (e.g. Kata). The root cause is a bug in
containerd's client/task.go: getRuncOptions() unconditionally tries to
unmarshal the container's stored runtimeOptions into containerd.runc.v1.Options,
but Kata containers store runtimeoptions.v1.Options. This causes:

  failed to create containerd task: failed to get runtime v2 options:
  can't unmarshal type "runtimeoptions.v1.Options" to output
  "containerd.runc.v1.Options"

A fix has been submitted upstream. Until it is merged and released,
clone containerd from the fork that carries the fix so that
`make cri-integration` (which builds and runs its own containerd daemon)
picks up the corrected binary.

TODO: revert once the fix is in an upstream containerd release and
versions.yaml is updated accordingly.

Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>

.cspell.yaml

@@ -1,37 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json
-version: "0.2"
-language: en,en-GB
-
-dictionaryDefinitions:
-  - name: kata-terms
-    path: ./tests/spellcheck/kata-dictionary.txt
-    addWords: true
-
-dictionaries:
-  - en-GB
-  - en_US
-  - bash
-  - git
-  - golang
-  - k8s
-  - python
-  - rust
-  - companies
-  - mnemonics
-  - peopleNames
-  - softwareTerms
-  - networking-terms
-  - kata-terms
-
-ignoreRegExpList:
-  - /@[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}/gi  # Ignores github handles
-  # Ignore code blocks
-  - /^\s*`{3,}[\s\S]*?^\s*`{3,}/gm
-  - /`[^`\n]+`/g
-
-ignorePaths:
-  - "**/vendor/**"  # vendor files aren't owned by us
-  - "**/src/runtime/virtcontainers/pkg/cloud-hypervisor/client/**"  # Generated files
-  - "**/requirements.txt"
-
-useGitignore: true

.github/dependabot.yml

@@ -37,9 +37,9 @@ updates:
     # create groups for common dependencies, so they can all go in a single PR
     # We can extend this as we see more frequent groups
     groups:
-      aws-libcrypto:
+      bit-vec:
         patterns:
-          - aws-lc-*
+          - bit-vec
       bumpalo:
         patterns:
           - bumpalo
@@ -67,9 +67,6 @@ updates:
       rustix:
         patterns:
           - rustix
-      rustls-webpki:
-        patterns:
-          - rustls-webpki
       slab:
         patterns:
           - slab

.github/workflows/basic-ci-amd64.yaml

@@ -25,10 +25,9 @@ jobs:
       fail-fast: false
       matrix:
         containerd_version: ['active']
-        vmm: ['dragonball', 'cloud-hypervisor', 'qemu-runtime-rs']
-    # TODO: enable me when https://github.com/containerd/containerd/issues/11640 is fixed
-    if: false
-    runs-on: ubuntu-22.04
+        # vmm: ['dragonball', 'cloud-hypervisor', 'qemu-runtime-rs']
+        vmm: ['dragonball', 'qemu-runtime-rs']
+    runs-on: ubuntu-24.04
     env:
       CONTAINERD_VERSION: ${{ matrix.containerd_version }}
       GOPATH: ${{ github.workspace }}

.github/workflows/build-kata-static-tarball-amd64.yaml

@@ -47,7 +47,6 @@ jobs:
           - coco-guest-components
           - firecracker
           - kernel
-          - kernel-debug
           - kernel-dragonball-experimental
           - kernel-nvidia-gpu
           - nydus
@@ -169,6 +168,8 @@ jobs:
           - rootfs-image-nvidia-gpu-confidential
           - rootfs-initrd
           - rootfs-initrd-confidential
+          - rootfs-initrd-nvidia-gpu
+          - rootfs-initrd-nvidia-gpu-confidential
     steps:
       - name: Login to Kata Containers quay.io
         if: ${{ inputs.push-to-registry == 'yes' }}
@@ -348,16 +349,6 @@ jobs:
           ./tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh kata-artifacts versions.yaml
         env:
           RELEASE: ${{ inputs.stage == 'release' && 'yes' || 'no' }}
-      - name: Check kata tarball size (GitHub release asset limit)
-        run: |
-          # https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases#storage-and-bandwidth-quotas
-          GITHUB_ASSET_MAX_BYTES=2147483648
-          tarball_size=$(stat -c "%s" kata-static.tar.zst)
-          if [[ "${tarball_size}" -ge "${GITHUB_ASSET_MAX_BYTES}" ]]; then
-            echo "::error::tarball size (${tarball_size} bytes) >= GitHub release asset limit (${GITHUB_ASSET_MAX_BYTES} bytes)"
-            exit 1
-          fi
-          echo "tarball size: ${tarball_size} bytes"
       - name: store-artifacts
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
@@ -376,6 +367,7 @@ jobs:
       matrix:
         asset:
           - agent-ctl
+          - csi-kata-directvolume
           - genpolicy
           - kata-ctl
           - kata-manager
@@ -458,16 +450,6 @@ jobs:
           ./tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh kata-tools-artifacts versions.yaml kata-tools-static.tar.zst
         env:
           RELEASE: ${{ inputs.stage == 'release' && 'yes' || 'no' }}
-      - name: Check kata-tools tarball size (GitHub release asset limit)
-        run: |
-          # https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases#storage-and-bandwidth-quotas
-          GITHUB_ASSET_MAX_BYTES=2147483648
-          tarball_size=$(stat -c "%s" kata-tools-static.tar.zst)
-          if [[ "${tarball_size}" -ge "${GITHUB_ASSET_MAX_BYTES}" ]]; then
-            echo "::error::tarball size (${tarball_size} bytes) >= GitHub release asset limit (${GITHUB_ASSET_MAX_BYTES} bytes)"
-            exit 1
-          fi
-          echo "tarball size: ${tarball_size} bytes"
       - name: store-artifacts
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:

.github/workflows/build-kata-static-tarball-arm64.yaml

@@ -45,7 +45,6 @@ jobs:
           - cloud-hypervisor
           - firecracker
           - kernel
-          - kernel-debug
           - kernel-dragonball-experimental
           - kernel-nvidia-gpu
           - kernel-cca-confidential
@@ -153,6 +152,7 @@ jobs:
           - rootfs-image
           - rootfs-image-nvidia-gpu
           - rootfs-initrd
+          - rootfs-initrd-nvidia-gpu
     steps:
       - name: Login to Kata Containers quay.io
         if: ${{ inputs.push-to-registry == 'yes' }}
@@ -327,16 +327,6 @@ jobs:
           ./tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh kata-artifacts versions.yaml
         env:
           RELEASE: ${{ inputs.stage == 'release' && 'yes' || 'no' }}
-      - name: Check kata tarball size (GitHub release asset limit)
-        run: |
-          # https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases#storage-and-bandwidth-quotas
-          GITHUB_ASSET_MAX_BYTES=2147483648
-          tarball_size=$(stat -c "%s" kata-static.tar.zst)
-          if [[ "${tarball_size}" -ge "${GITHUB_ASSET_MAX_BYTES}" ]]; then
-            echo "::error::tarball size (${tarball_size} bytes) >= GitHub release asset limit (${GITHUB_ASSET_MAX_BYTES} bytes)"
-            exit 1
-          fi
-          echo "tarball size: ${tarball_size} bytes"
       - name: store-artifacts
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:

.github/workflows/build-kata-static-tarball-ppc64le.yaml

@@ -262,16 +262,6 @@ jobs:
           ./tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh kata-artifacts versions.yaml
         env:
           RELEASE: ${{ inputs.stage == 'release' && 'yes' || 'no' }}
-      - name: Check kata tarball size (GitHub release asset limit)
-        run: |
-          # https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases#storage-and-bandwidth-quotas
-          GITHUB_ASSET_MAX_BYTES=2147483648
-          tarball_size=$(stat -c "%s" kata-static.tar.zst)
-          if [[ "${tarball_size}" -ge "${GITHUB_ASSET_MAX_BYTES}" ]]; then
-            echo "::error::tarball size (${tarball_size} bytes) >= GitHub release asset limit (${GITHUB_ASSET_MAX_BYTES} bytes)"
-            exit 1
-          fi
-          echo "tarball size: ${tarball_size} bytes"
       - name: store-artifacts
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:

.github/workflows/build-kata-static-tarball-s390x.yaml

@@ -350,16 +350,6 @@ jobs:
           ./tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh kata-artifacts versions.yaml
         env:
           RELEASE: ${{ inputs.stage == 'release' && 'yes' || 'no' }}
-      - name: Check kata tarball size (GitHub release asset limit)
-        run: |
-          # https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases#storage-and-bandwidth-quotas
-          GITHUB_ASSET_MAX_BYTES=2147483648
-          tarball_size=$(stat -c "%s" kata-static.tar.zst)
-          if [[ "${tarball_size}" -ge "${GITHUB_ASSET_MAX_BYTES}" ]]; then
-            echo "::error::tarball size (${tarball_size} bytes) >= GitHub release asset limit (${GITHUB_ASSET_MAX_BYTES} bytes)"
-            exit 1
-          fi
-          echo "tarball size: ${tarball_size} bytes"
       - name: store-artifacts
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:

.github/workflows/ci.yaml

@@ -216,6 +216,61 @@ jobs:
           platforms: linux/amd64, linux/s390x
           file: tests/integration/kubernetes/runtimeclass_workloads/confidential/unencrypted/Dockerfile
 
+  publish-csi-driver-amd64:
+    name: publish-csi-driver-amd64
+    needs: build-kata-static-tarball-amd64
+    permissions:
+      contents: read
+      packages: write
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          ref: ${{ inputs.commit-hash }}
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Rebase atop of the latest target branch
+        run: |
+          ./tests/git-helper.sh "rebase-atop-of-the-latest-target-branch"
+        env:
+          TARGET_BRANCH: ${{ inputs.target-branch }}
+
+      - name: get-kata-tools-tarball
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: kata-tools-static-tarball-amd64-${{ inputs.tag }}
+          path: kata-tools-artifacts
+
+      - name: Install kata-tools
+        run: bash tests/integration/kubernetes/gha-run.sh install-kata-tools kata-tools-artifacts
+
+      - name: Copy binary into Docker context
+        run: |
+          # Copy to the location where the Dockerfile expects the binary.
+          mkdir -p src/tools/csi-kata-directvolume/bin/
+          cp /opt/kata/bin/csi-kata-directvolume src/tools/csi-kata-directvolume/bin/directvolplugin
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+
+      - name: Login to Kata Containers ghcr.io
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker build and push
+        uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0
+        with:
+          tags: ghcr.io/kata-containers/csi-kata-directvolume:${{ inputs.pr-number }}
+          push: true
+          context: src/tools/csi-kata-directvolume/
+          platforms: linux/amd64
+          file: src/tools/csi-kata-directvolume/Dockerfile
+
   run-kata-monitor-tests:
     if: ${{ inputs.skip-test != 'yes' }}
     needs: build-kata-static-tarball-amd64
@@ -294,6 +349,7 @@ jobs:
     needs:
      - publish-kata-deploy-payload-amd64
      - build-and-publish-tee-confidential-unencrypted-image
+     - publish-csi-driver-amd64
     uses: ./.github/workflows/run-kata-coco-tests.yaml
     permissions:
       contents: read

.github/workflows/docs.yaml

@@ -4,18 +4,17 @@ on:
     branches:
       - main
 permissions: {}
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  build:
-    runs-on: ubuntu-24.04
-    name: Build docs
+  deploy-docs:
+    name: deploy-docs
     permissions:
       contents: read
       pages: write
       id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0
       - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
@@ -24,30 +23,10 @@ jobs:
       - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: 3.x
-
-      - run: pip install -r docs/requirements.txt
-      - run: python3 -m mkdocs build --config-file ./mkdocs.yaml --site-dir site/
-        id: build
-
+      - run: pip install zensical
+      - run: zensical build --clean
       - uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
-        id: deployment
         with:
-          path: site/
-          name: github-pages
-
-  deploy:
-    needs: build
-    runs-on: ubuntu-24.04
-    name: Deploy docs
-    permissions:
-      pages: write
-      id-token: write
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - name: Deploy to GitHub Pages
-        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5
+          path: site
+      - uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5
         id: deployment
-        with:
-          artifact_name: github-pages

.github/workflows/osv-scanner.yaml

@@ -19,25 +19,23 @@ permissions: {}
 
 jobs:
   scan-scheduled:
-    name: Scan of whole repo
     permissions:
       actions: read # # Required to upload SARIF file to CodeQL
       contents: read  # Read commit contents
       security-events: write  # Require writing security events to upload SARIF file to security tab
     if: ${{ github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
-    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@8ae4be80636b94886b3c271caad730985ce0611c" # v2.3.3
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@b00f71e051ddddc6e46a193c31c8c0bf283bf9e6" # v2.1.0
     with:
       scan-args: |-
         -r
         ./
   scan-pr:
-    name: Scan of just PR code
     permissions:
       actions: read # Required to upload SARIF file to CodeQL
       contents: read  # Read commit contents
       security-events: write  # Require writing security events to upload SARIF file to security tab
     if: ${{ github.event_name == 'pull_request' }}
-    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@8ae4be80636b94886b3c271caad730985ce0611c" # v2.3.3
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@b00f71e051ddddc6e46a193c31c8c0bf283bf9e6" # v2.1.0
     with:
       # Example of specifying custom arguments
       scan-args: |-

.github/workflows/run-k8s-tests-on-nvidia-gpu.yaml

@@ -49,8 +49,6 @@ jobs:
       KATA_HYPERVISOR: ${{ matrix.environment.vmm }}
       KUBERNETES: kubeadm
       KBS: ${{ matrix.environment.name == 'nvidia-gpu-snp' && 'true' || 'false' }}
-      SNAPSHOTTER: ${{ matrix.environment.name == 'nvidia-gpu-snp' && 'nydus' || '' }}
-      USE_EXPERIMENTAL_SNAPSHOTTER_SETUP: ${{ matrix.environment.name == 'nvidia-gpu-snp' && 'true' || 'false' }}
       K8S_TEST_HOST_TYPE: baremetal
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -100,7 +98,7 @@ jobs:
         run: bash tests/integration/kubernetes/gha-run.sh install-bats
 
       - name: Run tests ${{ matrix.environment.vmm }}
-        timeout-minutes: 60
+        timeout-minutes: 30
         run: bash tests/integration/kubernetes/gha-run.sh run-nv-tests
         env:
           NGC_API_KEY: ${{ secrets.NGC_API_KEY }}

.github/workflows/run-kata-coco-tests.yaml

@@ -110,6 +110,10 @@ jobs:
         timeout-minutes: 10
         run: bash tests/integration/kubernetes/gha-run.sh install-kbs-client
 
+      - name: Deploy CSI driver
+        timeout-minutes: 5
+        run: bash tests/integration/kubernetes/gha-run.sh deploy-csi-driver
+
       - name: Run tests
         timeout-minutes: 100
         run: bash tests/integration/kubernetes/gha-run.sh run-tests
@@ -130,6 +134,10 @@ jobs:
           [[ "${KATA_HYPERVISOR}" == "qemu-tdx" ]] && echo "ITA_KEY=${GH_ITA_KEY}" >> "${GITHUB_ENV}"
           bash tests/integration/kubernetes/gha-run.sh delete-coco-kbs
 
+      - name: Delete CSI driver
+        timeout-minutes: 5
+        run: bash tests/integration/kubernetes/gha-run.sh delete-csi-driver
+
   # Generate jobs for testing CoCo on non-TEE environments
   run-k8s-tests-coco-nontee:
     name: run-k8s-tests-coco-nontee
@@ -227,6 +235,10 @@ jobs:
         timeout-minutes: 10
         run: bash tests/integration/kubernetes/gha-run.sh install-kbs-client
 
+      - name: Deploy CSI driver
+        timeout-minutes: 5
+        run: bash tests/integration/kubernetes/gha-run.sh deploy-csi-driver
+
       - name: Run tests
         timeout-minutes: 80
         run: bash tests/integration/kubernetes/gha-run.sh run-tests
@@ -245,6 +257,11 @@ jobs:
         timeout-minutes: 10
         run: bash tests/integration/kubernetes/gha-run.sh delete-coco-kbs
 
+      - name: Delete CSI driver
+        if: always()
+        timeout-minutes: 5
+        run: bash tests/integration/kubernetes/gha-run.sh delete-csi-driver
+
   # Extensive matrix: autogenerated policy tests (nydus + experimental-force-guest-pull) on k0s, k3s, rke2, microk8s with qemu-coco-dev / qemu-coco-dev-runtime-rs
   run-k8s-tests-coco-nontee-extensive-matrix:
     if: ${{ inputs.extensive-matrix-autogenerated-policy == 'yes' }}
@@ -348,6 +365,10 @@ jobs:
         timeout-minutes: 10
         run: bash tests/integration/kubernetes/gha-run.sh install-kbs-client
 
+      - name: Deploy CSI driver
+        timeout-minutes: 5
+        run: bash tests/integration/kubernetes/gha-run.sh deploy-csi-driver
+
       - name: Run tests
         timeout-minutes: 80
         run: bash tests/integration/kubernetes/gha-run.sh run-tests
@@ -366,6 +387,11 @@ jobs:
         timeout-minutes: 10
         run: bash tests/integration/kubernetes/gha-run.sh delete-coco-kbs
 
+      - name: Delete CSI driver
+        if: always()
+        timeout-minutes: 5
+        run: bash tests/integration/kubernetes/gha-run.sh delete-csi-driver
+
   # Generate jobs for testing CoCo on non-TEE environments with erofs-snapshotter
   run-k8s-tests-coco-nontee-with-erofs-snapshotter:
     name: run-k8s-tests-coco-nontee-with-erofs-snapshotter
@@ -452,6 +478,10 @@ jobs:
         timeout-minutes: 20
         run: bash tests/integration/kubernetes/gha-run.sh deploy-kata
 
+      - name: Deploy CSI driver
+        timeout-minutes: 5
+        run: bash tests/integration/kubernetes/gha-run.sh deploy-csi-driver
+
       - name: Run tests
         timeout-minutes: 80
         run: bash tests/integration/kubernetes/gha-run.sh run-tests
@@ -464,3 +494,8 @@ jobs:
         if: always()
         timeout-minutes: 15
         run: bash tests/integration/kubernetes/gha-run.sh cleanup
+
+      - name: Delete CSI driver
+        if: always()
+        timeout-minutes: 5
+        run: bash tests/integration/kubernetes/gha-run.sh delete-csi-driver

.github/workflows/spellcheck.yaml

@@ -1,30 +0,0 @@
-name: Spelling check
-
-on: ["pull_request"]
-
-permissions: {}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  check-spelling:
-    name: check-spelling
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Check Spelling
-        uses: streetsidesoftware/cspell-action@9cd41bb518a24fefdafd9880cbab8f0ceba04d28  # 8.3.0
-        with:
-          files: |
-            **/*.md
-            **/*.rst
-            **/*.txt
-          incremental_files_only: true
-          config: ".cspell.yaml"

.github/workflows/static-checks.yaml

@@ -138,7 +138,7 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
       - name: Install system dependencies
         run: |
-          sudo apt-get update && sudo apt-get -y install moreutils
+          sudo apt-get update && sudo apt-get -y install moreutils hunspell hunspell-en-gb hunspell-en-us pandoc
       - name: Install open-policy-agent
         run: |
           cd "${GOPATH}/src/github.com/${GITHUB_REPOSITORY}"

.gitignore

@@ -20,6 +20,3 @@ tools/packaging/static-build/agent/install_libseccomp.sh
 .direnv
 **/.DS_Store
 site/
-opt/
-tools/packaging/kernel/configs/**/.config
-root_hash.txt

Cargo.toml

@@ -6,12 +6,6 @@ rust-version = "1.88"
 
 [workspace]
 members = [
-  # kata-agent
-  "src/agent",
-  "src/agent/rustjail",
-  "src/agent/policy",
-  "src/agent/vsock-exporter",
-
   # Dragonball
   "src/dragonball",
   "src/dragonball/dbs_acpi",
@@ -28,9 +22,6 @@ members = [
   "src/dragonball/dbs_utils",
   "src/dragonball/dbs_virtio_devices",
 
-  # genpolicy
-  "src/tools/genpolicy",
-
   # runtime-rs
   "src/runtime-rs",
   "src/runtime-rs/crates/agent",
@@ -47,6 +38,7 @@ resolver = "2"
 
 # TODO: Add all excluded crates to root workspace
 exclude = [
+  "src/agent",
   "src/tools",
   "src/libs",
 
@@ -61,19 +53,19 @@ exclude = [
 
 [workspace.dependencies]
 # Rust-VMM crates
-event-manager = "0.4.0"
-kvm-bindings = "0.14.0"
-kvm-ioctls = "0.24.0"
-linux-loader = "0.13.0"
+event-manager = "0.2.1"
+kvm-bindings = "0.6.0"
+kvm-ioctls = "=0.12.1"
+linux-loader = "0.8.0"
 seccompiler = "0.5.0"
-vfio-bindings = "0.6.1"
-vfio-ioctls = "0.5.0"
-virtio-bindings = "0.2.0"
-virtio-queue = "0.17.0"
-vm-fdt = "0.3.0"
-vm-memory = "=0.17.1"
-vm-superio = "0.8.0"
-vmm-sys-util = "0.15.0"
+vfio-bindings = "0.3.0"
+vfio-ioctls = "0.1.0"
+virtio-bindings = "0.1.0"
+virtio-queue = "0.7.0"
+vm-fdt = "0.2.0"
+vm-memory = "0.10.0"
+vm-superio = "0.5.0"
+vmm-sys-util = "0.11.0"
 
 # Local dependencies from Dragonball Sandbox crates
 dragonball = { path = "src/dragonball" }
@@ -109,74 +101,40 @@ wasm_container = { path = "src/runtime-rs/crates/runtimes/wasm_container" }
 kata-sys-util = { path = "src/libs/kata-sys-util" }
 kata-types = { path = "src/libs/kata-types", features = ["safe-path"] }
 logging = { path = "src/libs/logging" }
-mem-agent = { path = "src/libs/mem-agent" }
 protocols = { path = "src/libs/protocols", features = ["async"] }
 runtime-spec = { path = "src/libs/runtime-spec" }
 safe-path = { path = "src/libs/safe-path" }
 shim-interface = { path = "src/libs/shim-interface" }
 test-utils = { path = "src/libs/test-utils" }
 
-# Local dependencies from `src/agent`
-kata-agent-policy = { path = "src/agent/policy" }
-rustjail = { path = "src/agent/rustjail" }
-vsock-exporter = { path = "src/agent/vsock-exporter" }
-
 # Outside dependencies
 actix-rt = "2.7.0"
 anyhow = "1.0"
-async-recursion = "0.3.2"
 async-trait = "0.1.48"
-capctl = "0.2.0"
-cfg-if = "1.0.0"
-cgroups = { package = "cgroups-rs", git = "https://github.com/kata-containers/cgroups-rs", rev = "v0.3.5" }
-clap = { version = "4.5.40", features = ["derive"] }
-const_format = "0.2.30"
 containerd-shim = { version = "0.10.0", features = ["async"] }
 containerd-shim-protos = { version = "0.10.0", features = ["async"] }
-derivative = "2.2.0"
-futures = "0.3.30"
 go-flag = "0.1.0"
 hyper = "0.14.20"
 hyperlocal = "0.8.0"
-ipnetwork = "0.17.0"
 lazy_static = "1.4"
-libc = "0.2.94"
+libc = "0.2"
 log = "0.4.14"
-netlink-packet-core = "0.7.0"
-netlink-packet-route = "0.19.0"
-netlink-sys = { version = "0.7.0", features = ["tokio_socket"] }
 netns-rs = "0.1.0"
 # Note: nix needs to stay sync'd with libs versions
 nix = "0.26.4"
 oci-spec = { version = "0.8.1", features = ["runtime"] }
-opentelemetry = { version = "0.17.0", features = ["rt-tokio"] }
-procfs = "0.12.0"
-prometheus = { version = "0.14.0", features = ["process"] }
 protobuf = "3.7.2"
 rand = "0.8.4"
-regex = "1.10.5"
-rstest = "0.18.0"
-rtnetlink = "0.14.0"
-scan_fmt = "0.2.6"
-scopeguard = "1.0.0"
 serde = { version = "1.0.145", features = ["derive"] }
 serde_json = "1.0.91"
-serial_test = "0.10.0"
 sha2 = "0.10.9"
 slog = "2.5.2"
 slog-scope = "4.4.0"
-slog-stdlog = "4.0.0"
-slog-term = "2.9.0"
 strum = { version = "0.24.0", features = ["derive"] }
-strum_macros = "0.26.2"
 tempfile = "3.19.1"
-thiserror = "1.0.26"
+thiserror = "1.0"
 tokio = "1.46.1"
-tokio-vsock = "0.3.4"
-toml = "0.5.8"
 tracing = "0.1.41"
 tracing-opentelemetry = "0.18.0"
-tracing-subscriber = "0.3.20"
 ttrpc = "0.8.4"
 url = "2.5.4"
-which = "4.3.0"

Makefile

@@ -49,11 +49,8 @@ docs-url-alive-check:
 build-and-publish-kata-debug:
 	bash tools/packaging/kata-debug/kata-debug-build-and-upload-payload.sh ${KATA_DEBUG_REGISTRY} ${KATA_DEBUG_TAG}
 
-docs-build:
-	docker build -t kata-docs:latest -f ./docs/Dockerfile ./docs
-
-docs-serve: docs-build
-	docker run --rm -p 8000:8000 -v ${PWD}:/docs:ro kata-docs:latest serve --config-file /docs/mkdocs.yaml -a 0.0.0.0:8000
+docs-serve:
+	docker run --rm -p 8000:8000 -v ./docs:/docs:ro -v ${PWD}/zensical.toml:/zensical.toml:ro zensical/zensical serve --config-file /zensical.toml -a 0.0.0.0:8000
 
 .PHONY: \
 	all \
@@ -62,5 +59,4 @@ docs-serve: docs-build
 	default \
 	static-checks \
 	docs-url-alive-check \
-	docs-build \
 	docs-serve

README.md

@@ -74,7 +74,7 @@ See the [official documentation](docs) including:
 - [Developer guide](docs/Developer-Guide.md)
 - [Design documents](docs/design)
   - [Architecture overview](docs/design/architecture)
-  - [Architecture 4.0 overview](docs/design/architecture_4.0/)
+  - [Architecture 3.0 overview](docs/design/architecture_3.0/)
 
 ## Configuration
 

VERSION

@@ -1 +1 @@
-3.28.0
+3.27.0

ci/README.md

@@ -378,7 +378,7 @@ that is used in the test" section.  From there you can see exactly what you'll
 have to use when deploying kata-deploy in your local cluster.
 
 > [!NOTE]
-> TODO: @wainersm TO FINISH THIS PART BASED ON HIS PR TO RUN A LOCAL CI
+> TODO: WAINER TO FINISH THIS PART BASED ON HIS PR TO RUN A LOCAL CI
 
 ## Adding new runners
 

ci/openshift-ci/README.md

@@ -98,7 +98,7 @@ Let's say the OCP pipeline passed running with
 but failed running with
 ``quay.io/kata-containers/kata-deploy-ci:kata-containers-9f512c016e75599a4a921bd84ea47559fe610057-amd64``
 and you'd like to know which PR caused the regression. You can either run with
-all the 60 tags between or you can utilize the [`bisecter`](https://github.com/ldoktor/bisecter)
+all the 60 tags between or you can utilize the [bisecter](https://github.com/ldoktor/bisecter)
 to optimize the number of steps in between.
 
 Before running the bisection you need a reproducer script. Sample one called

docs/.nav.yml

@@ -1,18 +0,0 @@
-# https://lukasgeiter.github.io/mkdocs-awesome-nav/
-nav:
-  - Home: index.md
-  - Getting Started:
-    - prerequisites.md
-    - installation.md
-    - Configuration:
-        - helm-configuration.md
-        - runtime-configuration.md
-  - Platform Support:
-    - hypervisors.md
-  - Guides:
-    - Use Cases:
-      - NVIDIA GPU Passthrough: use-cases/NVIDIA-GPU-passthrough-and-Kata-QEMU.md
-      - NVIDIA vGPU: use-cases/NVIDIA-GPU-passthrough-and-Kata.md
-      - Intel Discrete GPU: use-cases/Intel-Discrete-GPU-passthrough-and-Kata.md
-  - Misc:
-    - Architecture: design/architecture/

docs/Developer-Guide.md

@@ -522,18 +522,10 @@ $ sudo kata-runtime check
 If your system is *not* able to run Kata Containers, the previous command will error out and explain why.
 
 # Run Kata Containers with Containerd
-
 Refer to the [How to use Kata Containers and Containerd](how-to/containerd-kata.md) how-to guide.
 
 # Run Kata Containers with Kubernetes
-
-- Containerd
-
-Refer to the [How to use Kata Containers and Containerd with Kubernetes](how-to/how-to-use-k8s-with-containerd-and-kata.md) how-to guide.
-
-- CRI-O
-
-Refer to the [How to use Kata Containers and CRI-O with Kubernetes](how-to/how-to-use-k8s-with-crio-and-kata.md) how-to guide.
+Refer to the [Run Kata Containers with Kubernetes](how-to/run-kata-with-k8s.md) how-to guide.
 
 # Troubleshoot Kata Containers
 
@@ -738,7 +730,7 @@ sudo sed -i -e 's/^kernel_params = "\(.*\)"/kernel_params = "\1 agent.debug_cons
 
 ##### Connecting to the debug console
 
-Next, connect to the debug console. The VSOCK paths vary slightly between each
+Next, connect to the debug console. The VSOCKS paths vary slightly between each
 VMM solution.
 
 In case of cloud-hypervisor, connect to the `vsock` as shown:

docs/Dockerfile

@@ -1,11 +0,0 @@
-# Copyright 2026 Kata Contributors
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-FROM python:3.12-slim
-
-WORKDIR /
-COPY ./requirements.txt requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt
-
-ENTRYPOINT ["python3", "-m", "mkdocs"]

docs/Documentation-Requirements.md

@@ -188,14 +188,15 @@ and compare them with standard tools (e.g. `diff(1)`).
 # Spelling
 
 Since this project uses a number of terms not found in conventional
-dictionaries, we have a [kata-dictionary](../tests/spellcheck/kata-dictionary.txt)
-that contains some project specific terms we use.
+dictionaries, we have a
+[spell checking tool](https://github.com/kata-containers/kata-containers/tree/main/tests/cmd/check-spelling)
+that checks both dictionary words and the additional terms we use.
 
-You can run the `cspell` checking tool on your document before raising a PR to ensure it
+Run the spell checking tool on your document before raising a PR to ensure it
 is free of mistakes.
 
 If your document introduces new terms, you need to update the custom
-dictionary to incorporate the new words.
+dictionary used by the spell checking tool to incorporate the new words.
 
 # Names
 

docs/Release-Process.md

@@ -1,69 +1,59 @@
 # How to do a Kata Containers Release
-
 This document lists the tasks required to create a Kata Release.
 
 ## Requirements
 
 - GitHub permissions to run workflows.
 
-## Release Model
+## Versioning
 
-Kata Containers follows a rolling release model with monthly snapshots.
-New features, bug fixes, and improvements are continuously integrated into
-`main`. Each month, a snapshot is tagged as a new `MINOR` release.
+The Kata Containers project uses [semantic versioning](http://semver.org/) for all releases.
+Semantic versions are comprised of three fields in the form:
 
-### Versioning
+```
+MAJOR.MINOR.PATCH
+```
 
-Releases use the `MAJOR.MINOR.PATCH` scheme. Monthly snapshots increment
-`MINOR`; `PATCH` is typically `0`. Major releases are rare (years apart) and
-signal significant architectural changes that may require updates to container
-managers (Containerd, CRI-O) or other infrastructure. Breaking changes in
-`MINOR` releases are avoided where possible, but may occasionally occur as
-features are deprecated or removed.
+When `MINOR` increases, the new release adds **new features** but *without changing the existing behavior*.
 
-### No Stable Branches
+When `MAJOR` increases, the new release adds **new features, bug fixes, or
+both** and which **changes the behavior from the previous release** (incompatible with previous releases).
 
-The Kata Containers project does not maintain stable branches (see
-[#9064](https://github.com/kata-containers/kata-containers/issues/9064)).
-Bug fixes land on `main` and ship in the next monthly snapshot rather than
-being backported. Downstream projects that need extended support or compliance
-certifications should select a monthly snapshot as their stable base and manage
-their own validation and patch backporting from there.
+A major release will also likely require a change of the container manager version used,
+-for example Containerd or CRI-O. Please refer to the release notes for further details.
+
+**Important** : the Kata Containers project doesn't have stable branches (see
+[this issue](https://github.com/kata-containers/kata-containers/issues/9064) for details).
+Bug fixes are released as part of `MINOR` or `MAJOR` releases only. `PATCH` is always `0`.
 
 ## Release Process
 
-### Lock the `main` branch and announce release process
-
-In order to prevent any PRs getting merged during the release process, and
-slowing the release process down, by impacting the payload caches, we have
-recently trialed setting the `main` branch to read-only.
-Once the `kata-containers/kata-containers` repository is ready for a new
-release, lock the main branch until the release action has completed.
-Notify the #kata-dev Slack channel about the ongoing release process.
-Ideally, CI usage by others should be reduced to a minimum during the
-ongoing release process.
-
-> [!NOTE]
-> Admin permission is needed to lock/unlock the `main` branch.
-
 ### Bump the `VERSION` and `Chart.yaml` file
 
-Create a PR to set the release in the [`VERSION`](./../VERSION) file and to
-update the `version` and `appVersion` fields in the
-[`Chart.yaml`](./../tools/packaging/kata-deploy/helm-chart/kata-deploy/Chart.yaml)
-file. Temporarily unlock the main branch to merge the PR.
+When the `kata-containers/kata-containers` repository is ready for a new release,
+first create a PR to set the release in the [`VERSION`](./../VERSION) file and update the
+`version` and `appVersion` in the
+[`Chart.yaml`](./../tools/packaging/kata-deploy/helm-chart/kata-deploy/Chart.yaml) file and
+have it merged.
+
+### Lock the `main` branch
+
+In order to prevent any PRs getting merged during the release process, and slowing the release
+process down, by impacting the payload caches, we have recently trailed setting the `main`
+branch to read only whilst the release action runs.
+
+> [!NOTE]
+> Admin permission is needed to complete this task.
 
 ### Wait for the `VERSION` bump PR payload publish to complete
 
-To reduce the chance of need to re-run the release workflow, check the [CI |
-Publish Kata Containers
-payload](https://github.com/kata-containers/kata-containers/actions/workflows/payload-after-push.yaml)
+To reduce the chance of need to re-run the release workflow, check the
+[CI | Publish Kata Containers payload](https://github.com/kata-containers/kata-containers/actions/workflows/payload-after-push.yaml)
 once the `VERSION` PR bump has merged to check that the assets build correctly
 and are cached, so that the release process can just download these artifacts
-rather than needing to build them all, which takes time and can reveal errors in
-infra.
+rather than needing to build them all, which takes time and can reveal errors in infra.
 
-### Trigger the `Release Kata Containers` GitHub Action
+### Check GitHub Actions
 
 We make use of [GitHub actions](https://github.com/features/actions) in the
 [release](https://github.com/kata-containers/kata-containers/actions/workflows/release.yaml)
@@ -73,10 +63,11 @@ release artifacts.
 > [!NOTE]
 > Write permissions to trigger the action.
 
-The action is manually triggered and is responsible for generating a new release
-(including a new tag), pushing those to the `kata-containers/kata-containers`
-repository. The new release is initially created as a draft. It is promoted to
-an official release when the whole workflow has completed successfully.
+The action is manually triggered and is responsible for generating a new
+release (including a new tag), pushing those to the
+`kata-containers/kata-containers` repository. The new release is initially
+created as a draft. It is promoted to an official release when the whole
+workflow has completed successfully.
 
 Check the [actions status
 page](https://github.com/kata-containers/kata-containers/actions) to verify all
@@ -84,13 +75,12 @@ steps in the actions workflow have completed successfully. On success, a static
 tarball containing Kata release artifacts will be uploaded to the [Release
 page](https://github.com/kata-containers/kata-containers/releases).
 
-If the workflow fails because of some external environmental causes, e.g.
-network timeout, simply re-run the failed jobs until they eventually succeed.
+If the workflow fails because of some external environmental causes, e.g. network
+timeout, simply re-run the failed jobs until they eventually succeed.
 
-If for some reason you need to cancel the workflow or re-run it entirely, go
-first to the [Release
-page](https://github.com/kata-containers/kata-containers/releases) and delete
-the draft release from the previous run.
+If for some reason you need to cancel the workflow or re-run it entirely, go first
+to the [Release page](https://github.com/kata-containers/kata-containers/releases) and
+delete the draft release from the previous run.
 
 ### Unlock the `main` branch
 
@@ -100,8 +90,9 @@ an admin to do it.
 ### Improve the release notes
 
 Release notes are auto-generated by the GitHub CLI tool used as part of our
-release workflow.  However, some manual tweaking may still be necessary in order
-to highlight the most important features and bug fixes in a specific release.
+release workflow.  However, some manual tweaking may still be necessary in
+order to highlight the most important features and bug fixes in a specific
+release.
 
 With this in mind, please, poke @channel on #kata-dev and people who worked on
 the release will be able to contribute to that.

docs/code-pr-advice.md

@@ -231,6 +231,12 @@ Run the
 [markdown checker](https://github.com/kata-containers/kata-containers/tree/main/tests/cmd/check-markdown)
 on your documentation changes.
 
+### Spell check
+
+Run the
+[spell checker](https://github.com/kata-containers/kata-containers/tree/main/tests/cmd/check-spelling)
+on your documentation changes.
+
 ## Finally
 
 You may wish to read the documentation that the

docs/design/architecture/kubernetes.md

@@ -32,4 +32,4 @@ runtime. Refer to the following guides on how to set up Kata
 Containers with Kubernetes:
 
 - [How to use Kata Containers and containerd](../../how-to/containerd-kata.md)
-- [Run Kata Containers with Kubernetes](../../how-to/how-to-use-k8s-with-crio-and-kata.md)
+- [Run Kata Containers with Kubernetes](../../how-to/run-kata-with-k8s.md)

docs/design/architecture_3.0/README.md

@@ -0,0 +1,168 @@
+# Kata 3.0 Architecture
+## Overview
+In cloud-native scenarios, there is an increased demand for container startup speed, resource consumption, stability, and security, areas where the present Kata Containers runtime is challenged relative to other runtimes. To achieve this, we propose a solid, field-tested and secure Rust version of the kata-runtime.
+
+Also, we provide the following designs:
+
+- Turn key solution with builtin `Dragonball` Sandbox
+- Async I/O to reduce resource consumption
+- Extensible framework for multiple services, runtimes and hypervisors
+- Lifecycle management for sandbox and container associated resources
+
+### Rationale for choosing Rust
+
+We chose Rust because it is designed as a system language with a focus on efficiency.
+In contrast to Go, Rust makes a variety of design trade-offs in order to obtain
+good execution performance, with innovative techniques that, in contrast to C or
+C++, provide reasonable protection against common memory errors (buffer
+overflow, invalid pointers, range errors), error checking (ensuring errors are
+dealt with), thread safety, ownership of resources, and more.
+
+These benefits were verified in our project when the Kata Containers guest agent
+was rewritten in Rust. We notably saw a significant reduction in memory usage
+with the Rust-based implementation.
+
+
+## Design
+### Architecture
+![architecture](./images/architecture.png)
+### Built-in VMM
+#### Current Kata 2.x architecture
+![not_builtin_vmm](./images/not_built_in_vmm.png)
+As shown in the figure, runtime and VMM are separate processes. The runtime process forks the VMM process and interacts through the inter-process RPC. Typically, process interaction consumes more resources than peers within the process, and it will result in relatively low efficiency. At the same time, the cost of resource operation and maintenance should be considered. For example, when performing resource recovery under abnormal conditions, the exception of any process must be detected by others and activate the appropriate resource recovery process. If there are additional processes, the recovery becomes even more difficult.
+#### How To Support Built-in VMM
+We provide `Dragonball` Sandbox to enable built-in VMM by integrating VMM's function into the Rust library. We could perform VMM-related functionalities by using the library. Because runtime and VMM  are in the same process, there is a benefit in terms of message processing speed and API synchronization. It can also guarantee the consistency of the runtime and the VMM life cycle, reducing resource recovery and exception handling maintenance, as shown in the figure:
+![builtin_vmm](./images/built_in_vmm.png)
+### Async Support
+#### Why Need Async
+**Async is already in stable Rust and allows us to write async code**
+
+- Async provides significantly reduced CPU and memory overhead, especially for workloads with a large amount of IO-bound tasks
+- Async is zero-cost in Rust, which means that you only pay for what you use. Specifically, you can use async without heap allocations and dynamic dispatch, which greatly improves efficiency
+- For more (see [Why Async?](https://rust-lang.github.io/async-book/01_getting_started/02_why_async.html) and [The State of Asynchronous Rust](https://rust-lang.github.io/async-book/01_getting_started/03_state_of_async_rust.html)).
+
+**There may be several problems if implementing kata-runtime with Sync Rust**
+
+- Too many threads with a new TTRPC connection
+   - TTRPC threads: reaper thread(1) + listener thread(1) + client handler(2)
+- Add 3 I/O threads with a new container
+- In Sync mode, implementing a timeout mechanism is challenging. For example, in TTRPC API interaction, the timeout mechanism is difficult to align with Golang
+#### How To Support Async
+The kata-runtime is controlled by TOKIO_RUNTIME_WORKER_THREADS to run the OS thread, which is 2 threads by default. For TTRPC and container-related threads run in the `tokio` thread in a unified manner, and related dependencies need to be switched to Async, such as Timer, File, Netlink, etc. With the help of Async, we can easily support no-block I/O and timer. Currently, we only utilize Async for kata-runtime. The built-in VMM keeps the OS thread because it can ensure that the threads are controllable.
+
+**For N `tokio` worker threads and M containers**
+
+- Sync runtime(both OS thread and `tokio` task are OS thread but without `tokio` worker thread)  OS thread number:  4 + 12*M
+- Async runtime(only OS thread is OS thread) OS thread number: 2 + N
+```shell
+├─ main(OS thread)
+├─ async-logger(OS thread)
+└─ tokio worker(N * OS thread)
+  ├─ agent log forwarder(1 * tokio task)
+  ├─ health check thread(1 * tokio task)
+  ├─ TTRPC reaper thread(M * tokio task)
+  ├─ TTRPC listener thread(M * tokio task)
+  ├─ TTRPC client handler thread(7 * M * tokio task)
+  ├─ container stdin io thread(M * tokio task)
+  ├─ container stdout io thread(M * tokio task)
+  └─ container stderr io thread(M * tokio task)
+```
+### Extensible Framework
+The Kata 3.x runtime is designed with the extension of service, runtime, and hypervisor, combined with configuration to meet the needs of different scenarios. At present, the service provides a register mechanism to support multiple services. Services could interact with runtime through messages. In addition, the runtime handler handles messages from services. To meet the needs of a binary that supports multiple runtimes and hypervisors, the startup must obtain the runtime handler type and hypervisor type through configuration.
+
+![framework](./images/framework.png)
+### Resource Manager
+In our case, there will be a variety of resources, and every resource has several subtypes. Especially for `Virt-Container`, every subtype of resource has different operations. And there may be dependencies, such as the share-fs rootfs and the share-fs volume will use share-fs resources to share files to the VM. Currently, network and share-fs are regarded as sandbox resources, while rootfs, volume, and cgroup are regarded as container resources. Also, we abstract a common interface for each resource and use subclass operations to evaluate the differences between different subtypes.
+![resource manager](./images/resourceManager.png)
+
+## Roadmap
+
+- Stage 1 (June): provide basic features (current delivered)
+- Stage 2 (September): support common features
+- Stage 3: support full features
+
+| **Class**                  | **Sub-Class**       | **Development Stage** | **Status** |
+| -------------------------- | ------------------- | --------------------- |------------|
+| Service                    | task service        | Stage 1               |  ✅        |
+|                            | extend service      | Stage 3               |  🚫        |
+|                            | image service       | Stage 3               |  🚫        |
+| Runtime handler            | `Virt-Container`    | Stage 1               |  ✅        |
+| Endpoint                   | VETH Endpoint       | Stage 1               |  ✅        |
+|                            | Physical Endpoint   | Stage 2               |  ✅        |
+|                            | Tap Endpoint        | Stage 2               |  ✅        |
+|                            | `Tuntap` Endpoint   | Stage 2               |  ✅        |
+|                            | `IPVlan` Endpoint   | Stage 2               |  ✅        |
+|                            | `MacVlan` Endpoint  | Stage 2               |  ✅        |
+|                            | MACVTAP Endpoint    | Stage 3               |  🚫        |
+|                            | `VhostUserEndpoint` | Stage 3               |  🚫        |
+| Network Interworking Model | Tc filter           | Stage 1               |  ✅        |
+|                            | `MacVtap`           | Stage 3               |  🚧        |
+| Storage                    | Virtio-fs           | Stage 1               |  ✅        |
+|                            | `nydus`             | Stage 2               |  🚧        |
+|                            | `device mapper`     | Stage 2               |  🚫        |
+| `Cgroup V2`                |                     | Stage 2               |  🚧        |
+| Hypervisor                 | `Dragonball`        | Stage 1               |  🚧        |
+|                            | QEMU                | Stage 2               |  🚫        |
+|                            | Cloud Hypervisor    | Stage 3               |  🚫        |
+|                            | Firecracker         | Stage 3               |  🚫        |
+
+## FAQ
+
+- Are the "service", "message dispatcher" and "runtime handler" all part of the single Kata 3.x runtime binary?
+
+  Yes. They are components in Kata 3.x runtime. And they will be packed into one binary.
+  1. Service is an interface, which is responsible for handling multiple services like task service, image service and etc.
+  2. Message dispatcher, it is used to match multiple requests from the service module.
+  3. Runtime handler is used to deal with the operation for sandbox and container.
+- What is the name of the Kata 3.x runtime binary?
+
+  Apparently we can't use `containerd-shim-v2-kata` because it's already used. We are facing the hardest issue of "naming" again. Any suggestions are welcomed.
+  Internally we use `containerd-shim-v2-rund`.
+
+- Is the Kata 3.x design compatible with the containerd shimv2 architecture?
+
+  Yes. It is designed to follow the functionality of go version kata.  And it implements the `containerd shim v2` interface/protocol.
+
+- How will users migrate to the Kata 3.x architecture?
+
+  The migration plan will be provided before the Kata 3.x is merging into the main branch.
+
+- Is `Dragonball` limited to its own built-in VMM? Can the `Dragonball` system be configured to work using an external `Dragonball` VMM/hypervisor?
+
+  The `Dragonball` could work as an external hypervisor. However, stability and performance is challenging in this case. Built in VMM could optimise the container overhead, and it's easy to maintain stability.
+
+  `runD` is the `containerd-shim-v2` counterpart of `runC` and can run a pod/containers. `Dragonball` is a `microvm`/VMM that is designed to run container workloads. Instead of `microvm`/VMM, we sometimes refer to it as secure sandbox.
+
+- QEMU, Cloud Hypervisor and Firecracker support are planned, but how that would work. Are they working in separate process?
+
+  Yes. They are unable to work as built in VMM.
+
+- What is `upcall`?
+
+    The `upcall` is used to hotplug CPU/memory/MMIO devices, and it solves two issues.
+    1. avoid dependency on PCI/ACPI
+    2. avoid dependency on `udevd` within guest and get deterministic results for hotplug operations. So `upcall` is an alternative to ACPI based CPU/memory/device hotplug. And we may cooperate with the community to add support for ACPI based CPU/memory/device hotplug if needed.
+
+    `Dbs-upcall` is a `vsock-based` direct communication tool between VMM and guests. The server side of the `upcall` is a driver in guest kernel (kernel patches are needed for this feature) and it'll start to serve the requests once the kernel has started. And the client side is in VMM , it'll be a thread that communicates with VSOCK through `uds`. We have accomplished device hotplug / hot-unplug directly through `upcall` in order to avoid virtualization of ACPI  to minimize virtual machine's overhead. And there could be many other usage through this direct communication channel. It's already open source.
+   https://github.com/openanolis/dragonball-sandbox/tree/main/crates/dbs-upcall
+
+- The URL below says the kernel patches work with 4.19, but do they also work with 5.15+ ?
+
+  Forward compatibility should be achievable, we have ported it to 5.10 based kernel.
+
+- Are these patches platform-specific or would they work for any architecture that supports VSOCK?
+
+  It's almost platform independent, but some message related to CPU hotplug are platform dependent.
+
+- Could the kernel driver be replaced with a userland daemon in the guest using loopback VSOCK?
+
+  We need to create device nodes for hot-added CPU/memory/devices, so it's not easy for userspace daemon to do these tasks.
+
+- The fact that `upcall` allows communication between the VMM and the guest suggests that this architecture might be incompatible with https://github.com/confidential-containers where the VMM should have no knowledge of what happens inside the VM.
+
+  1. `TDX` doesn't support CPU/memory hotplug yet.
+  2. For ACPI based device hotplug, it depends on ACPI `DSDT` table, and the guest kernel will execute `ASL` code to handle during handling those hotplug event. And it should be easier to audit VSOCK based communication than ACPI `ASL` methods.
+
+- What is the security boundary for the monolithic / "Built-in VMM" case?
+
+  It has the security boundary of virtualization. More details will be provided in next stage.

docs/design/architecture_4.0/README.md

@@ -1,433 +0,0 @@
-# Kata Containers 4.0 Architecture (Rust Runtime)
-
-## Overview
-
-Kata Containers 4.0 represents a significant architectural evolution, moving beyond the limitations of legacy multi-process container runtimes. Driven by a modern Rust-based stack, this release transitions to an asynchronous, unified architecture that drastically reduces resource consumption and latency.
-
-By consolidating the entire runtime into a single, high-performance binary, Kata 4.0 eliminates the overhead of cross-process communication and streamlines the container lifecycle. The result is a secure, production-tested runtime capable of handling high-density workloads with efficiency. With built-in support for diverse container abstractions and optimized hypervisor integration, Kata 4.0 delivers the agility and robustness required by modern, cloud-native infrastructure.
-
----
-
-## 1. Architecture Overview
-
-The Kata Containers Rust Runtime is designed to minimize resource overhead and startup latency. It achieves this by shifting from traditional process-based management to a more integrated, Rust-native control flow.
-
-```mermaid
-graph TD
-    containerd["containerd"] --> shimv2["containerd-shim-kata-v2 (shimv2)"]
-
-    subgraph BuiltIn["Built-in VMM (Integrated Mode)"]
-        direction TD
-        subgraph shimv2_bi["shimv2 process (Single Process)"]
-            runtime_bi["shimv2 runtime"]
-            subgraph dragonball["Dragonball VMM (library)"]
-                helpers_bi["virtiofs / nydus\n(BuiltIn)"]
-            end
-            runtime_bi -->|"direct function calls"| dragonball
-        end
-        subgraph guestvm_bi["Guest VM"]
-            agent_bi["kata-agent"]
-        end
-        shimv2_bi -->|"hybrid-vsock"| guestvm_bi
-    end
-
-    subgraph OptionalVMM["Optional VMM (External Mode)"]
-        direction TD
-        shimv2_ext["shimv2 process"]
-        imagesrvd_ext["virtiofsd / nydusd\n(Independent Process)"]
-        ext_vmm["External VMM process\n(QEMU / Cloud-Hypervisor / Firecracker)"]
-        subgraph guestvm_ext["Guest VM"]
-            agent_ext["kata-agent"]
-        end
-        shimv2_ext -->|"fork + IPC/RPC"| ext_vmm
-        shimv2_ext -->|"manages"| imagesrvd_ext
-        ext_vmm -->|"vsock / hybrid-vsock"| guestvm_ext
-    end
-
-    shimv2 --> BuiltIn
-    shimv2 --> OptionalVMM
-
-    classDef process fill:#d0e8ff,stroke:#336,stroke-width:1px
-    classDef vm fill:#d4edda,stroke:#155724,stroke-width:1px
-    classDef agent fill:#fff3cd,stroke:#856404,stroke-width:1px
-    class shimv2,runtime_bi,shimv2_ext,helpers_bi,imagesrvd_ext,ext_vmm process
-    class guestvm_bi,guestvm_ext vm
-    class agent_bi,agent_ext agent
-```
-
-The runtime employs a **flexible VMM strategy**, supporting both `built-in` and `optional` VMMs. This allows users to choose between a tightly integrated VMM (e.g., Dragonball) for peak performance, or external options (e.g., QEMU, Cloud-Hypervisor, Firecracker) for enhanced compatibility and modularity.
-
-### A. Built-in VMM (Integrated Mode)
-
-The built-in VMM mode is the default and recommended configuration for users, as it offers superior performance and resource efficiency.
-
-In this mode, the VMM (`Dragonball`) is **deeply integrated** into the `shimv2`'s lifecycle. This eliminates the overhead of IPC, enabling lower-latency message processing and tight API synchronization. Moreover, it ensures the runtime and VMM share a unified lifecycle, simplifying exception handling and resource cleanup.
-
-*   **Integrated Management**: The `shimv2` directly controls the VMM and its critical helper services (`virtiofsd` or `nydusd`).
-*   **Performance**: By eliminating external process overhead and complex inter-process communication (IPC), this mode achieves faster container startup and higher resource density.
-*   **Core Technology**: Primarily utilizes **Dragonball**, the native Rust-based VMM optimized and dedicated for cloud-native scenarios.
-
-> **Note**: The built-in VMM mode is the default and recommended configuration for users, as it offers superior performance and resource efficiency.
-
-### B. Optional VMM (External Mode)
-
-The optional VMM mode is available for users with specific requirements that necessitate external hypervisor support.
-
-In this mode, the runtime and the VMM operate as separate, decoupled processes. The runtime forks the VMM process and interacts with it via inter-process RPC. And the `containerd-shim-kata-v2`(short of `shimv2`) manages the VMM as an **external process**.
-
-*   **Decoupled Lifecycle**: The `shimv2` communicates with the VMM (e.g., QEMU, Cloud-Hypervisor, or Firecracker) via vsock/hybrid vsock.
-*   **Flexibility**: Ideal for environments that require specific hypervisor hardware emulation or legacy compatibility.
-
-> **Note**:  This approach (Optional VMM) introduces overhead due to context switching and cross-process communication. Furthermore, managing resources across process boundaries—especially during abnormal conditions—introduces significant complexity in error detection and recovery.
-
----
-
-## Core Architectural Principles
-
-*   **Safety via Rust**: Leveraging Rust's ownership and type systems to eliminate memory-related vulnerabilities (buffer overflows, dangling pointers) by design.
-*   **Performance via Async**: Utilizing Tokio to handle high-concurrency I/O, reducing the OS thread footprint by an order of magnitude.
-*   **Built-in VMM**: A modular, library-based approach to virtualization, enabling tighter integration with the runtime.
-*   **Pluggable Framework**: A clean abstraction layer allowing seamless swapping of hypervisors, network interfaces, and storage backends.
-
----
-
-## Design Deep Dive
-
-### Built-in VMM Integration (Dragonball)
-
-The legacy Kata 2.x architecture relied on inter-process communication (IPC) between the runtime and the VMM. This introduced context-switching latency and complex error-recovery requirements across process boundaries. In contrast, the built-in VMM approach embeds the VMM directly within the runtime's process space. This eliminates IPC overhead, allowing for direct function calls and shared memory access, resulting in significantly reduced startup times and improved performance.
-
-```mermaid
-graph LR
-    subgraph HostProcess["Host Process:containerd-shim-kata-v2 (shimv2)"]
-        shimv2["shimv2 runtime"]
-    end
-
-    imagesrvd["virtiofsd / nydusd\n(Independent Process)"]
-
-    subgraph ExtVMMProc["External VMM Process (e.g., QEMU)"]
-        vmm["VMM\n(QEMU / Cloud-Hypervisor\n/ Firecracker)"]
-    end
-
-    subgraph GuestVM["Guest VM"]
-        agent["kata-agent"]
-    end
-
-    shimv2 -->|"fork + IPC / RPC"| vmm
-    shimv2 -->|"manages"| imagesrvd
-    vmm -->|"vsock / hybrid-vsock"| GuestVM
-
-    classDef proc fill:#d0e8ff,stroke:#336,stroke-width:1px
-    classDef vm fill:#d4edda,stroke:#155724,stroke-width:1px
-    classDef ag fill:#fff3cd,stroke:#856404,stroke-width:1px
-    class shimv2,imagesrvd,vmm proc
-    class agent ag
-```
-
-```mermaid
-graph LR
-    subgraph SingleProcess["Single Process: containerd-shim-kata-v2 (shimv2)"]
-        shimv2["shimv2 runtime"]
-        subgraph dragonball["Dragonball VMM (library)"]
-            helpers["virtiofs / nydus\n(BuiltIn)"]
-        end
-        shimv2 -->|"direct function calls"| dragonball
-    end
-
-    subgraph GuestVM["Guest VM"]
-        agent["kata-agent"]
-    end
-
-    dragonball -->|"hybrid-vsock"| GuestVM
-
-    classDef proc fill:#d0e8ff,stroke:#336,stroke-width:1px
-    classDef vm fill:#d4edda,stroke:#155724,stroke-width:1px
-    classDef ag fill:#fff3cd,stroke:#856404,stroke-width:1px
-    class shimv2,helpers proc
-    class agent ag
-```
-
-By integrating Dragonball directly as a library, we eliminate the need for heavy IPC.
-
-*   **API Synchronization**: Direct function calls replace RPCs, reducing latency.
-*   **Unified Lifecycle**: The runtime and VMM share a single process lifecycle, significantly simplifying resource cleanup and fault isolation.
-
-### Layered Architecture
-
-The Kata 4.0 runtime utilizes a highly modular, layered architecture designed to decouple high-level service requests from low-level infrastructure execution. This design facilitates extensibility, allowing the system to support diverse container types and dragonball within a single, unified Rust binary and also support other hypervisors  as optional VMMs.
-
-```mermaid
-graph TD
-    subgraph L1["Layer 1 — Service & Orchestration Layer"]
-        TaskSvc["Task Service"]
-        ImageSvc["Image Service"]
-        OtherSvc["Other Services"]
-        Dispatcher["Message Dispatcher"]
-        TaskSvc --> Dispatcher
-        ImageSvc --> Dispatcher
-        OtherSvc --> Dispatcher
-    end
-
-    subgraph L2["Layer 2 — Management & Handler Layer"]
-        subgraph RuntimeHandler["Runtime Handler"]
-            SandboxMgr["Sandbox Manager"]
-            ContainerMgr["Container Manager"]
-        end
-        subgraph ContainerAbstractions["Container Abstractions"]
-            LinuxContainer["LinuxContainer"]
-            VirtContainer["VirtContainer"]
-            WasmContainer["WasmContainer"]
-        end
-    end
-
-    subgraph L3["Layer 3 — Infrastructure Abstraction Layer"]
-        subgraph HypervisorIface["Hypervisor Interface"]
-            Qemu["Qemu"]
-            CloudHV["Cloud Hypervisor"]
-            Firecracker["Firecracker"]
-            Dragonball["Dragonball"]
-        end
-        subgraph ResourceMgr["Resource Manager"]
-            Sharedfs["Sharedfs"]
-            Network["Network"]
-            Rootfs["Rootfs"]
-            Volume["Volume"]
-            Cgroup["Cgroup"]
-        end
-    end
-
-    subgraph L4["Layer 4 — Built-in Dragonball VMM Layer"]
-        BuiltinDB["Builtin Dragonball"]
-    end
-
-    Dispatcher --> RuntimeHandler
-    RuntimeHandler --> ContainerAbstractions
-    ContainerAbstractions --> HypervisorIface
-    ContainerAbstractions --> ResourceMgr
-    Dragonball --> BuiltinDB
-
-    classDef svc fill:#cce5ff,stroke:#004085,stroke-width:1px
-    classDef handler fill:#d4edda,stroke:#155724,stroke-width:1px
-    classDef infra fill:#fff3cd,stroke:#856404,stroke-width:1px
-    classDef builtin fill:#f8d7da,stroke:#721c24,stroke-width:1px
-    class TaskSvc,ImageSvc,OtherSvc,Dispatcher svc
-    class SandboxMgr,ContainerMgr,LinuxContainer,VirtContainer,WasmContainer handler
-    class Qemu,CloudHV,Firecracker,Dragonball,Sharedfs,Network,Rootfs,Volume,Cgroup infra
-    class BuiltinDB builtin
-```
-
-#### Service & Orchestration Layer
-
-*   **Service Layer**: The entry point for the runtime, providing specialized interfaces for external callers (e.g., `containerd`). It includes:
-    *   **Task Service**: Manages the lifecycle of containerized processes.
-    *   **Image Service**: Handles container image operations.
-    *   **Other Services**: An extensible framework allowing for custom modules.
-
-*   **Message Dispatcher**: Acts as a centralized traffic controller. It parses requests from the Service layer and routes them to the appropriate **Runtime Handler**, ensuring efficient message multiplexing.
-
-#### Management & Handler Layer
-
-*   **Runtime Handler**: The core processing engine. It abstracts the underlying workload, enabling the runtime to handle various container types through:
-    *   **Sandbox Manager**: Orchestrates the lifecycle of the entire Pod (Sandbox).
-    *   **Container Manager**: Manages individual containers within a Sandbox.
-
-*   **Container Abstractions**: The framework is agnostic to the container implementation, with explicit support paths for:
-    *   **LinuxContainer** (Standard/OCI)
-    *   **VirtContainer** (Virtualization-based)
-    *   **WasmContainer** (WebAssembly-based)
-
-#### Infrastructure Abstraction Layer
-
-This layer provides standardized interfaces for hardware and resource management, regardless of the underlying backend.
-
-*   **Hypervisor Interface**: A pluggable architecture supporting multiple virtualization backends, including **Qemu**, **Cloud Hypervisor**, **Firecracker**, and **Dragonball**.
-
-*   **Resource Manager**: A unified interface for managing critical infrastructure components:
-    *   **Sharedfs, Network, Rootfs, Volume, and cgroup management**.
-
-#### Built-in Dragonball VMM Layer
-
-Representing the core of the high-performance runtime, the `Builtin Dragonball` block demonstrates deep integration between the runtime and the hypervisor.
-
-#### Key Architectural Advantages
-
-*   **Uniformity**: By consolidating these layers into a single binary, the runtime ensures a consistent state across all sub-modules, preventing the "split-brain" scenarios common in multi-process runtimes.
-*   **Modularity**: The clear separation between the **Message Dispatcher** and the **Runtime Handler** allows developers to introduce new container types (e.g., WASM) or hypervisors without modifying existing core logic.
-*   **Efficiency**: The direct integration of `Dragonball` as a library allows for "Zero-Copy" resource management and direct API access, which drastically improves performance compared to traditional RPC-based hypervisor interaction.
-
-### Extensible Framework
-
-The Kata Rust runtime features a modular design that supports diverse services, runtimes, and hypervisors. We utilize a registration mechanism to decouple service logic from the core runtime. At startup, the runtime resolves the required runtime handler and hypervisor types based on configuration.
-
-```mermaid
-graph LR
-    API["API"]
-
-    subgraph Services["Configurable Services"]
-        TaskSvc["Task Service"]
-        ImageSvc["Image Service"]
-        OtherSvc["Other Service"]
-    end
-
-    Msg(["Message Dispatcher"])
-
-    subgraph Handlers["Configurable Runtime Handlers"]
-        WasmC["WasmContainer"]
-        VirtC["VirtContainer"]
-        LinuxC["LinuxContainer"]
-    end
-
-    subgraph HVs["Configurable Hypervisors"]
-        DB["Dragonball"]
-        QEMU["QEMU"]
-        CH["Cloud Hypervisor"]
-        FC["Firecracker"]
-    end
-
-    API --> Services
-    Services --> Msg
-    Msg --> Handlers
-    Handlers --> HVs
-
-    classDef api fill:#d0e8ff,stroke:#336,stroke-width:1px
-    classDef svc fill:#e2d9f3,stroke:#6610f2,stroke-width:1px
-    classDef msg fill:#fff3cd,stroke:#856404,stroke-width:1px
-    classDef handler fill:#d4edda,stroke:#155724,stroke-width:1px
-    classDef hv fill:#f8d7da,stroke:#721c24,stroke-width:1px
-    class API api
-    class TaskSvc,ImageSvc,OtherSvc svc
-    class Msg msg
-    class WasmC,VirtC,LinuxC handler
-    class DB,QEMU,CH,FC hv
-```
-
-### Modular Resource Manager
-
-Managing diverse resources—from Virtio-fs volumes to Cgroup V2—is handled by an abstracted resource manager. Each resource type implements a common trait, enabling uniform lifecycle hooks and deterministic dependency resolution.
-
-```mermaid
-graph LR
-    RM["Resource Manager"]
-
-    subgraph SandboxRes["Sandbox Resources"]
-        Network["Network Entity"]
-        SharedFs["Shared FS"]
-    end
-
-    subgraph ContainerRes["Container Resources"]
-        Rootfs["Rootfs"]
-        Cgroup["Cgroup"]
-        Volume["Volume"]
-    end
-
-    RM --> Network
-    RM --> SharedFs
-    RM --> Rootfs
-    RM --> Cgroup
-    RM --> Volume
-
-    Network --> Endpoint["endpoint\n(veth / physical)"]
-    Network --> NetModel["model\n(tcfilter / route)"]
-    SharedFs --> InlineVirtioFs["inline virtiofs"]
-    SharedFs --> StandaloneVirtioFs["standalone virtiofs"]
-
-    Rootfs --> RootfsTypes["block / virtiofs / nydus"]
-    Cgroup --> CgroupVers["v1 / v2"]
-    Volume --> VolumeTypes["sharefs / shm / local\nephemeral / direct / block"]
-
-    classDef rm fill:#e2d9f3,stroke:#6610f2,stroke-width:2px
-    classDef sandbox fill:#d0e8ff,stroke:#336,stroke-width:1px
-    classDef container fill:#d4edda,stroke:#155724,stroke-width:1px
-    classDef impl fill:#fff3cd,stroke:#856404,stroke-width:1px
-    class RM rm
-    class Network,SharedFs sandbox
-    class Rootfs,Cgroup,Volume container
-    class Endpoint,NetModel,InlineVirtioFs,StandaloneVirtioFs,RootfsTypes,CgroupVers,VolumeTypes impl
-```
-
-### Asynchronous I/O Model
-
-Synchronous runtimes are often limited by "thread bloat," where each container or connection spawns multiple OS threads.
-
-#### Why Async Rust?
-
-**The Rust async ecosystem is stable and highly efficient, providing several key benefits:**
-
-- Reduced Overhead: Significantly lower CPU and memory consumption, particularly for I/O-bound workloads.
-- Zero-Cost Abstractions: Rust's async model allows developers to "pay only for what they use," avoiding heap allocations and dynamic dispatch where possible.
-- For further reading, see [Why Async?](https://rust-lang.github.io/async-book/01_getting_started/02_why_async.html) and [The State of Asynchronous Rust](https://rust-lang.github.io/async-book/01_getting_started/03_state_of_async_rust.html).
-
-**Limitations of Synchronous Rust in kata-runtime:**
-
-- Thread Proliferation: Every TTRPC connection creates multiple threads (Reaper, Listener, Handler), and each container adds 3 additional I/O threads, leading to high thread count and memory pressure.
-- Timeout Complexity: Implementing reliable, cross-platform timeout mechanisms in synchronous code is difficult, especially when aligning with Golang-based components.
-
-#### Implementation
-
-The kata-runtime utilizes Tokio to manage asynchronous tasks. By offloading TTRPC and container-related I/O to a unified Tokio executor and switching dependencies (Timer, File, Netlink) to their asynchronous counterparts, we achieve non-blocking I/O. The built-in VMM remains on a dedicated OS thread to ensure control and real-time performance.
-
-**Comparison of OS Thread usage (for N tokio worker threads and M containers)**
-
-- Sync Runtime: OS thread count scales as 4 + 12*M.
-- Async Runtime: OS thread count scales as 2 + N.
-
-```shell
-├─ main(OS thread)
-├─ async-logger(OS thread)
-└─ tokio worker(N * OS thread)
-  ├─ agent log forwarder(1 * tokio task)
-  ├─ health check thread(1 * tokio task)
-  ├─ TTRPC reaper thread(M * tokio task)
-  ├─ TTRPC listener thread(M * tokio task)
-  ├─ TTRPC client handler thread(7 * M * tokio task)
-  ├─ container stdin io thread(M * tokio task)
-  ├─ container stdout io thread(M * tokio task)
-  └─ container stderr io thread(M * tokio task)
-```
-
-The Async Advantage:
-We move away from thread-per-task to a Tokio-driven task model.
-
-*   **Scalability**: The OS thread count is reduced from 4 + 12*M (Sync) to 2 + N (Async), where N is the worker thread count.
-*   **Efficiency**: Non-blocking I/O allows a single thread to handle multiplexed container operations, significantly lowering memory consumption for high-density pod deployments.
-
----
-
-## 2. Getting Started
-To configure your preferred VMM strategy, locate the `[hypervisor]` block in your runtime configuration file:
-
-- Install Kata Containers with the Rust Runtime and Dragonball as the built-in VMM by following the [containerd-kata](../../how-to/containerd-kata.md).
-- Run a kata with builtin VMM Dragonball
-
-```shell
-$ sudo ctr run  --runtime io.containerd.kata.v2 -d docker.io/library/ubuntu:latest hello
-```
-
-As the VMM and its image service have been builtin, you should only see a single containerd-shim-kata-v2 process.
-
----
-
-## FAQ
-
-* **Q1**: Is the architecture compatible with containerd?
-
-Yes. It implements the containerd-shim-v2 interface, ensuring drop-in compatibility with standard cloud-native tooling.
-
-* **Q2**: What is the security boundary for the "Built-in VMM" model?
-
-The security boundary remains established by the hypervisor (hardware virtualization). The shift to a monolithic process model does not compromise isolation; rather, it improves the integrity of the control plane by reducing the attack surface typically associated with complex IPC mechanisms.
-
-* **Q3**: What is the migration path?
-
-Migration is managed via configuration policies. The containerd shim configuration will allow users to toggle between the legacy runtime and the runtime-rs (internally `RunD`) binary, facilitating canary deployments and gradual migration.
-
-* **Q4**: Why upcall instead of ACPI?
-
-Standard ACPI-based hotplugging requires heavy guest-side kernel emulation and udevd interaction. Dbs-upcall utilizes a vsock-based direct channel to trigger hotplug events, providing:
-
-Deterministic execution: Bypassing complex guest-side ACPI state machines.
-Lower overhead: Minimizing guest kernel footprint.
-
-* **Q5**: How upcall works?
-
-The `Dbs-upcall` architecture consists of a server-side driver in the guest kernel and a client-side thread within the VMM. Once the guest kernel initializes, it establishes a communication channel via vsock (using uds). This allows the VMM to directly request device hot-add/hot-remove operations. We have already open-sourced this implementation: [dbs-upcall](https://github.com/openanolis/dragonball-sandbox/tree/main/crates/dbs-upcall).

docs/design/kata-api-design.md

@@ -43,7 +43,7 @@ To fulfill the [Kata design requirements](kata-design-requirements.md), and base
 |`sandbox.AddInterface(inf)`| Add new NIC to the sandbox.|
 |`sandbox.RemoveInterface(inf)`| Remove a NIC from the sandbox.|
 |`sandbox.ListInterfaces()`| List all NICs and their configurations in the sandbox, return a `pbTypes.Interface` list.|
-|`sandbox.UpdateRoutes(routes)`| Update the sandbox route table (e.g. for port mapping support), return a `pbTypes.Route` list.|
+|`sandbox.UpdateRoutes(routes)`| Update the sandbox route table (e.g. for portmapping support), return a `pbTypes.Route` list.|
 |`sandbox.ListRoutes()`| List the sandbox route table, return a `pbTypes.Route` list.|
 
 ### Sandbox Relay API

docs/design/kata-nydus-design.md

@@ -8,7 +8,7 @@ The following benchmarking result shows the performance improvement compared wit
 
 ## Proposal - Bring `lazyload` ability to Kata Containers
 
-`Nydusd` is a fuse/`virtiofs` daemon which is provided by `nydus` project and it supports `PassthroughFS` and [`rafs`](https://github.com/dragonflyoss/image-service/blob/master/docs/nydus-design.md) (Registry Acceleration File System) natively, so in Kata Containers, we can use `nydusd` in place of `virtiofsd` and mount `nydus` image to guest in the meanwhile.
+`Nydusd` is a fuse/`virtiofs` daemon which is provided by `nydus` project and it supports `PassthroughFS` and [RAFS](https://github.com/dragonflyoss/image-service/blob/master/docs/nydus-design.md) (Registry Acceleration File System) natively, so in Kata Containers, we can use `nydusd` in place of `virtiofsd` and mount `nydus` image to guest in the meanwhile.
 
 The process of creating/starting Kata Containers with `virtiofsd`,
 

docs/design/virtualization.md

@@ -1,324 +1,137 @@
 # Virtualization in Kata Containers
 
-## Overview
+Kata Containers, a second layer of isolation is created on top of those provided by traditional namespace-containers. The
+hardware virtualization interface is the basis of this additional layer. Kata will launch a lightweight virtual machine,
+and use the guest’s Linux kernel to create a container workload, or workloads in the case of multi-container pods. In Kubernetes
+and in the Kata implementation, the sandbox is carried out at the pod level. In Kata, this sandbox is created using a virtual machine.
 
-Kata Containers creates a second layer of isolation on top of traditional namespace-based containers using hardware virtualization. Kata launches a lightweight virtual machine (VM) and uses the guest Linux kernel to create container workloads. In Kubernetes, the sandbox is implemented at the pod level using VMs.
+This document describes how Kata Containers maps container technologies to virtual machines technologies, and how this is realized in
+the multiple hypervisors and virtual machine monitors that Kata supports.
 
-This document describes:
+## Mapping container concepts to virtual machine technologies
 
-- How Kata Containers maps container technologies to virtualization technologies
-- The multiple hypervisors and Virtual Machine Monitors (VMMs) supported by Kata
-- Guidance for selecting the appropriate hypervisor for your use case
+A typical deployment of Kata Containers will be in Kubernetes by way of a Container Runtime Interface (CRI) implementation. On every node,
+Kubelet will interact with a CRI implementer (such as containerd or CRI-O), which will in turn interface with Kata Containers (an OCI based runtime).
 
-### Architecture
+The CRI API, as defined at the [Kubernetes CRI-API repo](https://github.com/kubernetes/cri-api/), implies a few constructs being supported by the
+CRI implementation, and ultimately in Kata Containers. In order to support the full [API](https://github.com/kubernetes/cri-api/blob/a6f63f369f6d50e9d0886f2eda63d585fbd1ab6a/pkg/apis/runtime/v1alpha2/api.proto#L34-L110) with the CRI-implementer, Kata must provide the following constructs:
 
-A typical Kata Containers deployment integrates with Kubernetes through a Container Runtime Interface (CRI) implementation:
+![API to construct](./arch-images/api-to-construct.png)
 
-```
-Kubelet → CRI (containerd/CRI-O) → Kata Containers (OCI runtime) → VM → Containers
-```
+These constructs can then be further mapped to what devices are necessary for interfacing with the virtual machine:
 
-The CRI API requires Kata to support the following constructs:
+![construct to VM concept](./arch-images/construct-to-vm-concept.png)
 
-| CRI Construct | VM Equivalent | Virtualization Technology |
-|---------------|---------------|---------------------------|
-| Pod Sandbox | VM | Hypervisor/VMM |
-| Container | Process in VM | Namespace/Cgroup in guest |
-| Network | Network Interface | virtio-net, vhost-net, physical, etc. |
-| Storage | Block/File Device | virtio-block, virtio-scsi, virtio-fs |
-| Compute | vCPU/Memory | KVM, ACPI hotplug |
+Ultimately, these concepts map to specific para-virtualized devices or virtualization technologies.
 
-### Mapping Container Concepts to Virtualization Technologies
+![VM concept to underlying technology](./arch-images/vm-concept-to-tech.png)
 
-Kata Containers implements the Kubernetes Container Runtime Interface (CRI) to provide pod and container lifecycle management. The CRI API defines abstractions that Kata must translate into virtualization primitives.
+Each hypervisor or VMM varies on how or if it handles each of these.
 
-The mapping from CRI constructs to virtualization technologies follows a three-layer model:
+## Kata Containers Hypervisor and VMM support
 
-```
-CRI API Constructs → VM Abstractions → Para-virtualized Devices
-```
+Kata Containers [supports multiple hypervisors](../hypervisors.md).
 
-**Layer 1: CRI API Constructs**
-
-The CRI API ([kubernetes/cri-api](https://github.com/kubernetes/cri-api)) defines the following abstractions that Kata must implement:
-
-| Construct | Description |
-|-----------|-------------|
-| Pod Sandbox | Isolated execution environment for containers |
-| Container | Process workload within a sandbox |
-| Network | Pod and container networking interfaces |
-| Storage | Volume mounts and image storage |
-| RuntimeConfig | Resource constraints (CPU, memory, cgroups) |
-
-![CRI API to Kata Constructs](./arch-images/api-to-construct.png)
-
-**Layer 2: VM Abstractions**
-
-Kata translates CRI constructs into VM-level concepts:
-
-| CRI Construct | VM Equivalent |
-|---------------|---------------|
-| Pod Sandbox | Virtual Machine |
-| Container | Process/namespace in guest OS |
-| Network | Virtual NIC (vNIC) |
-| Storage | Virtual block device or filesystem |
-| RuntimeConfig | VM resources (vCPU, memory) |
-
-![Kata Constructs to VM Concepts](./arch-images/construct-to-vm-concept.png)
-
-**Layer 3: Para-virtualized Devices**
-
-VM abstractions are realized through para-virtualized drivers for optimal performance:
-
-| VM Concept | Device Technology |
-|------------|-------------------|
-| vNIC | virtio-net, vhost-net, macvtap |
-| Block Storage | virtio-block, virtio-scsi |
-| Shared Filesystem | virtio-fs |
-| Agent Communication | virtio-vsock |
-| Device Passthrough | VFIO with IOMMU |
-
-![VM Concepts to Underlying Technology](./arch-images/vm-concept-to-tech.png)
-
-> **Note:** Each hypervisor implements these mappings differently based on its device model and feature set. See the [Hypervisor Details](#hypervisor-details) section for specific implementations.
-
-### Device Mapping
-
-Container constructs map to para-virtualized devices:
-
-| Construct | Device Type | Technology |
-|-----------|-------------|------------|
-| Network | Network Interface | virtio-net, vhost-net |
-| Storage (ephemeral) | Block Device | virtio-block, virtio-scsi |
-| Storage (shared) | Filesystem | virtio-fs |
-| Communication | Socket | virtio-vsock |
-| GPU/Passthrough | PCI Device | VFIO, IOMMU |
-
-## Supported Hypervisors and VMMs
-
-Kata Containers supports multiple hypervisors, each with different characteristics:
-
-| Hypervisor | Language | Architectures | Type |
-|------------|----------|---------------|------|
-| [QEMU] | C | x86_64, aarch64, ppc64le, s390x, risc-v | Type 2 (KVM) |
-| [Cloud Hypervisor] | Rust | x86_64, aarch64 | Type 2 (KVM) |
-| [Firecracker] | Rust | x86_64, aarch64 | Type 2 (KVM) |
-| `Dragonball` | Rust | x86_64, aarch64 | Type 2 (KVM) Built-in |
-
-> **Note:** All supported hypervisors use KVM (Kernel-based Virtual Machine) as the underlying hardware virtualization interface on Linux.
-
-## Hypervisor Details
+Details of each solution and a summary are provided below.
 
 ### QEMU/KVM
 
-QEMU is the most mature and feature-complete hypervisor option for Kata Containers.
+Kata Containers with QEMU has complete compatibility with Kubernetes.
 
-**Machine Types:**
+Depending on the host architecture, Kata Containers supports various machine types,
+for example `q35` on x86 systems, `virt` on ARM systems and `pseries` on IBM Power systems. The default Kata Containers
+machine type is `q35`. The machine type and its [`Machine accelerators`](#machine-accelerators) can
+be changed by editing the runtime [`configuration`](architecture/README.md#configuration) file.
 
-- `q35` (x86_64, default)
-- `s390x` (s390x)
-- `virt` (aarch64)
-- `pseries` (ppc64le)
-- `risc-v` (riscv64, experimental)
+Devices and features used:
+- virtio VSOCK or virtio serial
+- virtio block or virtio SCSI
+- [virtio net](https://www.redhat.com/en/virtio-networking-series)
+- virtio fs or virtio 9p (recommend: virtio fs)
+- VFIO
+- hotplug
+- machine accelerators
 
-**Devices and Features:**
+Machine accelerators and hotplug are used in Kata Containers to manage resource constraints, improve boot time and reduce memory footprint. These are documented below.
 
-- virtio-vsock (agent communication)
-- virtio-block or virtio-scsi (storage)
-- virtio-net/vhost-net/vhost-user-net (networking)
-- virtio-fs (shared filesystem, virtio-fs recommended)
-- VFIO (device passthrough)
-- CPU and memory hotplug
-- NVDIMM (x86_64, for rootfs as persistent memory)
+#### Machine accelerators
 
-**Use Cases:**
+Machine accelerators are architecture specific and can be used to improve the performance
+and enable specific features of the machine types. The following machine accelerators
+are used in Kata Containers:
 
-- Production workloads requiring full CRI API compatibility
-- Scenarios requiring device passthrough (VFIO)
-- Multi-architecture deployments
+- NVDIMM: This machine accelerator is x86 specific and only supported by `q35` machine types.
+`nvdimm` is used to provide the root filesystem as a persistent memory device to the Virtual Machine.
 
-**Configuration:** See [`configuration-qemu.toml`](../../src/runtime/config/configuration-qemu.toml.in)
+#### Hotplug devices
 
-### Dragonball (Built-in VMM)
-
-Dragonball is a Rust-based VMM integrated directly into the Kata Containers Rust runtime as a library.
-
-**Advantages:**
-
-- **Zero IPC overhead**: VMM runs in the same process as the runtime
-- **Unified lifecycle**: Simplified resource management and error handling
-- **Optimized for containers**: Purpose-built for container workloads
-- **Upcall support**: Direct VMM-to-Guest communication for efficient hotplug operations
-- **Low resource overhead**: Minimal CPU and memory footprint
-
-**Architecture:**
-```
-┌─────────────────────────────────────────┐
-│     Kata Containers Runtime (Rust)      │
-│  ┌─────────────────────────────────┐    │
-│  │      Dragonball VMM Library     │    │
-│  └─────────────────────────────────┘    │
-└─────────────────────────────────────────┘
-```
-
-**Features:**
-
-- Built-in virtio-fs/nydus support
-- Async I/O via Tokio
-- Single binary deployment
-- Optimized startup latency
-
-**Use Cases:**
-
-- Default choice for most container workloads
-- High-density container deployments and low resource overhead scenarios
-- Scenarios requiring optimal startup performance
-
-**Configuration:** See [`configuration-dragonball.toml`](../../src/runtime-rs/config/configuration-dragonball.toml.in)
-
-### Cloud Hypervisor/KVM
-
-Cloud Hypervisor is a Rust-based VMM designed for modern cloud workloads with a focus on performance and security.
-
-**Features:**
-
-- CPU and memory resize
-- Device hotplug (disk, VFIO)
-- virtio-fs (shared filesystem)
-- virtio-pmem (persistent memory)
-- virtio-block (block storage)
-- virtio-vsock (agent communication)
-- Fine-grained seccomp filters per VMM thread
-- HTTP OpenAPI for management
-
-**Use Cases:**
-
-- High-performance cloud-native workloads
-- Applications requiring memory/CPU resizing
-- Security-sensitive deployments (seccomp isolation)
-
-**Configuration:** See [`configuration-cloud-hypervisor.toml`](../../src/runtime-rs/config/configuration-cloud-hypervisor.toml.in)
+The Kata Containers VM starts with a minimum amount of resources, allowing for faster boot time and a reduction in memory footprint.  As the container launch progresses,
+devices are hotplugged to the VM. For example, when a CPU constraint is specified which includes additional CPUs, they can be hot added.  Kata Containers has support
+for hot-adding the following devices:
+- Virtio block
+- Virtio SCSI
+- VFIO
+- CPU
 
 ### Firecracker/KVM
 
-Firecracker is a minimalist VMM built on rust-vmm crates, optimized for serverless and FaaS workloads.
+Firecracker, built on many rust crates that are within [rust-VMM](https://github.com/rust-vmm),  has a very limited device model, providing a lighter
+footprint and attack surface, focusing on function-as-a-service like use cases. As a result, Kata Containers with Firecracker VMM supports a subset of the CRI API.
+Firecracker does not support file-system sharing, and as a result only block-based storage drivers are supported. Firecracker does not support device
+hotplug nor does it support VFIO. As a result, Kata Containers with Firecracker VMM does not support updating container resources after boot, nor
+does it support device passthrough.
 
-**Devices:**
+Devices used:
+- virtio VSOCK
+- virtio block
+- virtio net
 
-- virtio-vsock (agent communication)
-- virtio-block (block storage)
-- virtio-net (networking)
+### Cloud Hypervisor/KVM
 
-**Limitations:**
+[Cloud Hypervisor](https://github.com/cloud-hypervisor/cloud-hypervisor), based
+on [rust-vmm](https://github.com/rust-vmm), is designed to have a
+lighter footprint and smaller attack surface for running modern cloud
+workloads. Kata Containers with Cloud
+Hypervisor provides mostly complete compatibility with Kubernetes
+comparable to the QEMU configuration. As of the 1.12 and 2.0.0 release
+of Kata Containers, the Cloud Hypervisor configuration supports both CPU
+and memory resize, device hotplug (disk and VFIO), file-system sharing through virtio-fs,
+block-based volumes, booting from VM images backed by pmem device, and
+fine-grained seccomp filters for each VMM threads (e.g. all virtio
+device worker threads).
 
-- No filesystem sharing (virtio-fs not supported)
-- No device hotplug
-- No VFIO/passthrough support
-- No CPU/memory hotplug
-- Limited CRI API support
+Devices and features used:
+- virtio VSOCK or virtio serial
+- virtio block
+- virtio net
+- virtio fs
+- virtio pmem
+- VFIO
+- hotplug
+- seccomp filters
+- [HTTP OpenAPI](https://github.com/cloud-hypervisor/cloud-hypervisor/blob/main/vmm/src/api/openapi/cloud-hypervisor.yaml)
 
-**Use Cases:**
+### StratoVirt/KVM
 
-- Serverless/FaaS workloads
-- Single-tenant microVMs
-- Scenarios prioritizing minimal attack surface
+[StratoVirt](https://gitee.com/openeuler/stratovirt) is an enterprise-level open source VMM oriented to cloud data centers, implements a unified architecture to support Standard-VMs, containers and serverless (Micro-VM). StratoVirt has some competitive advantages, such as lightweight and low resource overhead, fast boot, hardware acceleration, and language-level security with Rust.
 
-**Configuration:** See [`configuration-fc.toml`](../../src/runtime/config/configuration-fc.toml.in)
+Currently, StratoVirt in Kata supports Micro-VM machine type, mainly focus on FaaS cases, supporting device hotplug (virtio block), file-system sharing through virtio fs and so on. Kata Containers with StratoVirt now use virtio-mmio bus as driver, and doesn't support CPU/memory resize nor VFIO, thus doesn't support updating container resources after booted.
 
-## Hypervisor Comparison Summary
+Devices and features used currently:
+- Micro-VM machine type for FaaS(mmio, no ACPI)
+- Virtual Socket(vhost VSOCK、virtio console)
+- Virtual Storage(virtio block, mmio)
+- Virtual Networking(virtio net, mmio)
+- Shared Filesystem(virtio fs)
+- Device Hotplugging(virtio block hotplug)
+- Entropy Source(virtio RNG)
+- QMP API
 
-| Feature | QEMU | Cloud Hypervisor | Firecracker | Dragonball |
-|---------|------|------------------|-------------|------------|
-| Maturity | Excellent | Good | Good | Good |
-| CRI Compatibility | Full | Full | Partial | Full |
-| Filesystem Sharing | ✓ | ✓ | ✗ | ✓ |
-| Device Hotplug | ✓ | ✓ | ✗ | ✓ |
-| VFIO/Passthrough | ✓ | ✓ | ✗ | ✓ |
-| CPU/Memory Hotplug | ✓ | ✓ | ✗ | ✓ |
-| Security Isolation | Good | Excellent (seccomp) | Excellent | Excellent |
-| Startup Latency | Good | Excellent | Excellent | Best |
-| Resource Overhead | Medium | Low | Lowest | Lowest |
+### Summary
 
-## Choosing a Hypervisor
-
-### Decision Matrix
-
-| Requirement | Recommended Hypervisor |
-|-------------|------------------------|
-| Full CRI API compatibility | QEMU, Cloud Hypervisor, Dragonball |
-| Device passthrough (VFIO) | QEMU, Cloud Hypervisor, Dragonball |
-| Minimal resource overhead | Dragonball, Firecracker |
-| Fastest startup time | Dragonball, Firecracker |
-| Serverless/FaaS | Dragonball, Firecracker |
-| Production workloads | Dragonball, QEMU |
-| Memory/CPU resizing | Dragonball, Cloud Hypervisor, QEMU |
-| Maximum security isolation | Cloud Hypervisor (seccomp), Firecracker, Dragonball |
-| Multi-architecture | QEMU |
-
-### Recommendations
-
-**For Most Users:** Use the default Dragonball VMM with the Kata Containers Rust runtime. It provides the best balance of performance, security, and container density.
-
-**For Device Passthrough:** Use QEMU, Cloud Hypervisor, or Dragonball if you require VFIO device assignment.
-
-**For Serverless:** Use Dragonball or Firecracker for ultra-lightweight, single-tenant microVMs.
-
-**For Legacy/Ecosystem Compatibility:** Use QEMU for its extensive hardware emulation and multi-architecture support.
-
-## Hypervisor Configuration
-
-### Configuration Files
-
-Each hypervisor has a dedicated configuration file:
-
-| Hypervisor | Rust Runtime Configuration | Go Runtime Configuration |
-|------------|----------------|-----------------|
-| QEMU |`configuration-qemu-runtime-rs.toml` |`configuration-qemu.toml` |
-| Cloud Hypervisor | `configuration-cloud-hypervisor.toml` | `configuration-clh.toml` |
-| Firecracker | `configuration-rs-fc.toml` | `configuration-fc.toml` |
-| Dragonball | `configuration-dragonball.toml` (default) | `No` |
-
-> **Note:** Configuration files are typically installed in `/opt/kata/share/defaults/kata-containers/` or  `/opt/kata/share/defaults/kata-containers/runtime-rs/` or `/usr/share/defaults/kata-containers/`.
-
-### Switching Hypervisors
-
-Use the `kata-manager` tool to switch the configured hypervisor:
-
-```bash
-# List available hypervisors
-$ kata-manager -L
-
-# Switch to a different hypervisor
-$ sudo kata-manager -S <hypervisor-name>
-```
-
-For detailed instructions, see the [`kata-manager` documentation](../../utils/README.md).
-
-## Hypervisor Versions
-
-The following versions are used in this release (from [versions.yaml](../../versions.yaml)):
-
-| Hypervisor | Version | Repository |
-|------------|---------|------------|
-| Cloud Hypervisor | v51.1 | https://github.com/cloud-hypervisor/cloud-hypervisor |
-| Firecracker | v1.12.1 | https://github.com/firecracker-microvm/firecracker |
-| QEMU | v10.2.1 | https://github.com/qemu/qemu |
-| Dragonball | builtin | https://github.com/kata-containers/kata-containers/tree/main/src/dragonball |
-
-> **Note:** Dragonball is integrated into the Kata Containers Rust runtime and does not have a separate version number.
-> For the latest hypervisor versions, see the [versions.yaml](../../versions.yaml) file in the Kata Containers repository.
-
-## References
-
-- [Kata Containers Architecture](./architecture/README.md)
-- [Configuration Guide](../../src/runtime/README.md#configuration)
-- [QEMU Documentation](https://www.qemu.org/documentation/)
-- [Cloud Hypervisor Documentation](https://github.com/cloud-hypervisor/cloud-hypervisor/blob/main/docs/api.md)
-- [Firecracker Documentation](https://github.com/firecracker-microvm/firecracker/tree/main/docs)
-- [Dragonball Source](https://github.com/kata-containers/kata-containers/tree/main/src/dragonball)
-
-[KVM]: https://en.wikipedia.org/wiki/Kernel-based_Virtual_Machine
-[QEMU]: https://www.qemu.org
-[Cloud Hypervisor]: https://github.com/cloud-hypervisor/cloud-hypervisor
-[Firecracker]: https://github.com/firecracker-microvm/firecracker
-[`Dragonball`]: https://github.com/kata-containers/kata-containers/tree/main/src/dragonball
+| Solution | release introduced | brief summary |
+|-|-|-|
+| Cloud Hypervisor | 1.10 | upstream Cloud Hypervisor with rich feature support, e.g. hotplug, VFIO and FS sharing|
+| Firecracker | 1.5 | upstream Firecracker, rust-VMM based, no VFIO, no FS sharing, no memory/CPU hotplug |
+| QEMU | 1.0 | upstream QEMU, with support for hotplug and filesystem sharing |
+| StratoVirt | 3.3 | upstream StratoVirt with FS sharing and virtio block hotplug, no VFIO, no CPU/memory resize |

docs/helm-configuration.md

@@ -1,264 +0,0 @@
-# Helm Configuration
-
-## Parameters
-
-The helm chart provides a comprehensive set of configuration options. You may view the parameters and their descriptions by going to the [GitHub source](https://github.com/kata-containers/kata-containers/blob/main/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml) or by using helm:
-
-```sh
-# List available kata-deploy chart versions:
-#   helm search repo kata-deploy-charts/kata-deploy --versions
-#
-# Then replace X.Y.Z below with the desired chart version:
-helm show values --version X.Y.Z oci://ghcr.io/kata-containers/kata-deploy-charts/kata-deploy
-```
-
-### shims
-
-Kata ships with a number of pre-built artifacts and runtimes. You may selectively enable or disable specific shims. For example:
-
-```yaml title="values.yaml"
-shims:
-  disableAll: true
-  qemu:
-    enabled: true
-  qemu-nvidia-gpu:
-    enabled: true
-  qemu-nvidia-gpu-snp:
-    enabled: false
-
-```
-
-Shims can also have configuration options specific to them:
-
-```yaml
-  qemu-nvidia-gpu:
-    enabled: ~
-    supportedArches:
-      - amd64
-      - arm64
-    allowedHypervisorAnnotations: []
-    containerd:
-      snapshotter: ""
-    runtimeClass:
-      # This label is automatically added by gpu-operator. Override it
-      # if you want to use a different label.
-      # Uncomment once GPU Operator v26.3 is out
-      # nodeSelector:
-        # nvidia.com/cc.ready.state: "false"
-```
-
-It's best to reference the default `values.yaml` file above for more details.
-
-### Custom Runtimes
-
-Kata allows you to create custom runtime configurations. This is done by overlaying one of the pre-existing runtime configs with user-provided configs. For example, we can use the `qemu-nvidia-gpu` as a base config and overlay our own parameters to it:
-
-```yaml
-customRuntimes:
-  enabled: false
-  runtimes:
-    my-gpu-runtime:
-      baseConfig: "qemu-nvidia-gpu"  # Required: existing config to use as base
-      dropIn: |                      # Optional: overrides via config.d mechanism
-        [hypervisor.qemu]
-        default_memory = 1024
-        default_vcpus = 4
-      runtimeClass: |
-        kind: RuntimeClass
-        apiVersion: node.k8s.io/v1
-        metadata:
-          name: kata-my-gpu-runtime
-          labels:
-            app.kubernetes.io/managed-by: kata-deploy
-        handler: kata-my-gpu-runtime
-        overhead:
-          podFixed:
-            memory: "640Mi"
-            cpu: "500m"
-        scheduling:
-          nodeSelector:
-            katacontainers.io/kata-runtime: "true"
-      # Optional: CRI-specific configuration
-      containerd:
-        snapshotter: "nydus"  # Configure containerd snapshotter (nydus, erofs, etc.)
-      crio:
-        pullType: "guest-pull"  # Configure CRI-O runtime_pull_image = true
-```
-
-Again, view the default [`values.yaml`](#parameters) file for more details.
-
-## Examples
-
-We provide a few examples that you can pass to helm via the `-f`/`--values` flag.
-
-### [`try-kata-tee.values.yaml`](https://github.com/kata-containers/kata-containers/blob/main/tools/packaging/kata-deploy/helm-chart/kata-deploy/try-kata-tee.values.yaml)
-
-This file enables only the TEE (Trusted Execution Environment) shims for confidential computing:
-
-```sh
-helm install kata-deploy oci://ghcr.io/kata-containers/kata-deploy-charts/kata-deploy \
-  --version VERSION \
-  -f try-kata-tee.values.yaml
-```
-
-Includes:
-
-- `qemu-snp` - AMD SEV-SNP (amd64)
-- `qemu-tdx` - Intel TDX (amd64)
-- `qemu-se` - IBM Secure Execution for Linux (SEL) (s390x)
-- `qemu-se-runtime-rs` - IBM Secure Execution for Linux (SEL) Rust runtime (s390x)
-- `qemu-cca` - Arm Confidential Compute Architecture (arm64)
-- `qemu-coco-dev` - Confidential Containers development (amd64, s390x)
-- `qemu-coco-dev-runtime-rs` - Confidential Containers development Rust runtime (amd64, s390x)
-
-### [`try-kata-nvidia-gpu.values.yaml`](https://github.com/kata-containers/kata-containers/blob/main/tools/packaging/kata-deploy/helm-chart/kata-deploy/try-kata-nvidia-gpu.values.yaml)
-
-This file enables only the NVIDIA GPU-enabled shims:
-
-```sh
-helm install kata-deploy oci://ghcr.io/kata-containers/kata-deploy-charts/kata-deploy \
-  --version VERSION \
-  -f try-kata-nvidia-gpu.values.yaml
-```
-
-Includes:
-
-- `qemu-nvidia-gpu` - Standard NVIDIA GPU support (amd64, arm64)
-- `qemu-nvidia-gpu-snp` - NVIDIA GPU with AMD SEV-SNP (amd64)
-- `qemu-nvidia-gpu-tdx` - NVIDIA GPU with Intel TDX (amd64)
-
-### `nodeSelector`
-
-We can deploy Kata only to specific nodes using `nodeSelector`
-
-```sh
-# First, label the nodes where you want kata-containers to be installed
-$ kubectl label nodes worker-node-1 kata-containers=enabled
-$ kubectl label nodes worker-node-2 kata-containers=enabled
-
-# Then install the chart with `nodeSelector`
-$ helm install kata-deploy \
-  --set nodeSelector.kata-containers="enabled" \
-  "${CHART}" --version  "${VERSION}"
-```
-
-You can also use a values file:
-
-```yaml title="values.yaml"
-nodeSelector:
-  kata-containers: "enabled"
-  node-type: "worker"
-```
-
-```sh
-$ helm install kata-deploy -f values.yaml "${CHART}" --version "${VERSION}"
-```
-
-### Multiple Kata installations on the Same Node
-
-For debugging, testing and other use-case it is possible to deploy multiple
-versions of Kata on the very same node. All the needed artifacts are getting the
-`multiInstallSuffix` appended to distinguish each installation. **BEWARE** that one
-needs at least **containerd-2.0** since this version has drop-in conf support
-which is a prerequisite for the `multiInstallSuffix` to work properly.
-
-```sh
-$ helm install kata-deploy-cicd       \
-  -n kata-deploy-cicd                 \
-  --set env.multiInstallSuffix=cicd   \
-  --set env.debug=true                \
-  "${CHART}" --version  "${VERSION}"
-```
-
-Note: `runtimeClasses` are automatically created by Helm (via
-      `runtimeClasses.enabled=true`, which is the default).
-
-Now verify the installation by examining the `runtimeClasses`:
-
-```sh
-$ kubectl get runtimeClasses
-NAME                            HANDLER                         AGE
-kata-clh-cicd                   kata-clh-cicd                   77s
-kata-cloud-hypervisor-cicd      kata-cloud-hypervisor-cicd      77s
-kata-dragonball-cicd            kata-dragonball-cicd            77s
-kata-fc-cicd                    kata-fc-cicd                    77s
-kata-qemu-cicd                  kata-qemu-cicd                  77s
-kata-qemu-coco-dev-cicd         kata-qemu-coco-dev-cicd         77s
-kata-qemu-nvidia-gpu-cicd       kata-qemu-nvidia-gpu-cicd       77s
-kata-qemu-nvidia-gpu-snp-cicd   kata-qemu-nvidia-gpu-snp-cicd   77s
-kata-qemu-nvidia-gpu-tdx-cicd   kata-qemu-nvidia-gpu-tdx-cicd   76s
-kata-qemu-runtime-rs-cicd       kata-qemu-runtime-rs-cicd       77s
-kata-qemu-se-runtime-rs-cicd    kata-qemu-se-runtime-rs-cicd    77s
-kata-qemu-snp-cicd              kata-qemu-snp-cicd              77s
-kata-qemu-tdx-cicd              kata-qemu-tdx-cicd              77s
-kata-stratovirt-cicd            kata-stratovirt-cicd            77s
-```
-
-## RuntimeClass Node Selectors for TEE Shims
-
-**Manual configuration:** Any `nodeSelector` you set under `shims.<shim>.runtimeClass.nodeSelector`
-is **always applied** to that shim's RuntimeClass, whether or not NFD is present. Use this when
-you want to pin TEE workloads to specific nodes (e.g. without NFD, or with custom labels).
-
-**Auto-inject when NFD is present:** If you do *not* set a `runtimeClass.nodeSelector` for a
-TEE shim, the chart can **automatically inject** NFD-based labels when NFD is detected in the
-cluster (deployed by this chart with `node-feature-discovery.enabled=true` or found externally):
-
-- AMD SEV-SNP shims: `amd.feature.node.kubernetes.io/snp: "true"`
-- Intel TDX shims: `intel.feature.node.kubernetes.io/tdx: "true"`
-- IBM Secure Execution for Linux (SEL) shims (s390x): `feature.node.kubernetes.io/cpu-security.se.enabled: "true"`
-
-The chart uses Helm's `lookup` function to detect NFD (by looking for the
-`node-feature-discovery-worker` DaemonSet). Auto-inject only runs when NFD is detected and
-no manual `runtimeClass.nodeSelector` is set for that shim.
-
-**Note**: NFD detection requires cluster access. During `helm template` (dry-run without a
-cluster), external NFD is not seen, so auto-injected labels are not added. Manual
-`runtimeClass.nodeSelector` values are still applied in all cases.
-
-## Customizing Configuration with Drop-in Files
-
-When kata-deploy installs Kata Containers, the base configuration files should not
-be modified directly. Instead, use drop-in configuration files to customize
-settings. This approach ensures your customizations survive kata-deploy upgrades.
-
-### How Drop-in Files Work
-
-The Kata runtime reads the base configuration file and then applies any `.toml`
-files found in the `config.d/` directory alongside it. Files are processed in
-alphabetical order, with later files overriding earlier settings.
-
-### Creating Custom Drop-in Files
-
-To add custom settings, create a `.toml` file in the appropriate `config.d/`
-directory. Use a numeric prefix to control the order of application.
-
-**Reserved prefixes** (used by kata-deploy):
-
-- `10-*`: Core kata-deploy settings
-- `20-*`: Debug settings
-- `30-*`: Kernel parameters
-
-**Recommended prefixes for custom settings**: `50-89`
-
-### Drop-In Config Examples
-
-#### Adding Custom Kernel Parameters
-
-```bash
-# SSH into the node or use kubectl exec
-sudo mkdir -p /opt/kata/share/defaults/kata-containers/runtimes/qemu/config.d/
-sudo cat > /opt/kata/share/defaults/kata-containers/runtimes/qemu/config.d/50-custom.toml << 'EOF'
-[hypervisor.qemu]
-kernel_params = "my_param=value"
-EOF
-```
-
-#### Changing Default Memory Size
-
-```bash
-sudo cat > /opt/kata/share/defaults/kata-containers/runtimes/qemu/config.d/50-memory.toml << 'EOF'
-[hypervisor.qemu]
-default_memory = 4096
-EOF
-```

docs/how-to/README.md

@@ -3,9 +3,9 @@
 ## Kubernetes Integration
 
 - [Run Kata containers with `crictl`](run-kata-with-crictl.md)
+- [Run Kata Containers with Kubernetes](run-kata-with-k8s.md)
 - [How to use Kata Containers and Containerd](containerd-kata.md)
 - [How to use Kata Containers and containerd with Kubernetes](how-to-use-k8s-with-containerd-and-kata.md)
-- [How to use Kata Containers and CRI-O with Kubernetes](how-to-use-k8s-with-crio-and-kata.md)
 - [Kata Containers and service mesh for Kubernetes](service-mesh.md)
 - [How to import Kata Containers logs into Fluentd](how-to-import-kata-logs-with-fluentd.md)
 
@@ -50,4 +50,3 @@
 - [How to pull images in the guest](how-to-pull-images-in-guest-with-kata.md)
 - [How to use mem-agent to decrease the memory usage of Kata container](how-to-use-memory-agent.md)
 - [How to use seccomp with runtime-rs](how-to-use-seccomp-with-runtime-rs.md)
-- [How to use passthroughfd-IO with runtime-rs and Dragonball](how-to-use-passthroughfd-io-within-runtime-rs.md)

docs/how-to/containerd-kata.md

@@ -5,7 +5,7 @@ and [Kata Containers](https://katacontainers.io). The containerd provides not on
 command line tool, but also the [CRI](https://kubernetes.io/blog/2016/12/container-runtime-interface-cri-in-kubernetes/)
 interface for [Kubernetes](https://kubernetes.io) and other CRI clients.
 
-This document is primarily written for Kata Containers v3.28 or above, and containerd v1.7.0 or above.
+This document is primarily written for Kata Containers v1.5.0-rc2 or above, and containerd v1.2.0 or above.
 Previous versions are addressed here, but we suggest users upgrade to the newer versions for better support.
 
 ## Concepts
@@ -14,7 +14,7 @@ Previous versions are addressed here, but we suggest users upgrade to the newer
 
 [`RuntimeClass`](https://kubernetes.io/docs/concepts/containers/runtime-class/) is a Kubernetes feature first
 introduced in Kubernetes 1.12 as alpha. It is the feature for selecting the container runtime configuration to
-use to run a pod's containers. This feature is supported in `containerd` since [v1.2.0](https://github.com/containerd/containerd/releases/tag/v1.2.0).
+use to run a pod’s containers. This feature is supported in `containerd` since [v1.2.0](https://github.com/containerd/containerd/releases/tag/v1.2.0).
 
 Before the `RuntimeClass` was introduced, Kubernetes was not aware of the difference of runtimes on the node. `kubelet`
 creates Pod sandboxes and containers through CRI implementations, and treats all the Pods equally. However, there
@@ -23,7 +23,7 @@ workloads with isolated sandboxes (i.e. Kata Containers).
 
 As a result, the CRI implementations extended their semantics for the requirements:
 
-- At the beginning, [`Frakti`](https://github.com/kubernetes/frakti) checks the network configuration of a Pod, and
+- At the beginning, [Frakti](https://github.com/kubernetes/frakti) checks the network configuration of a Pod, and
   treat Pod with `host` network as trusted, while others are treated as untrusted.
 - The containerd introduced an annotation for untrusted Pods since [v1.0](https://github.com/containerd/cri/blob/v1.0.0-rc.0/docs/config.md):
   ```yaml
@@ -123,56 +123,18 @@ The following sections outline how to add Kata Containers to the configurations.
 
 #### Kata Containers as a `RuntimeClass`
 
-For Kubernetes users, we suggest using `RuntimeClass` to select Kata Containers as the runtime for untrusted workloads. The configuration is as follows:
-
-- Kata Containers v3.28.0 or above
-- Containerd v1.7.0 or above
-- Kubernetes v1.33 or above
+For
+- Kata Containers v1.5.0 or above (including `1.5.0-rc`)
+- Containerd v1.2.0 or above
+- Kubernetes v1.12.0 or above
 
 The `RuntimeClass` is suggested.
 
-The following example registers custom runtimes into containerd:
-
-You can check the detailed information about the configuration of containerd in the [Containerd config documentation](https://github.com/containerd/containerd/blob/main/docs/cri/config.md).
-
-+ In containerd 2.x
-
-```toml
-version = 3
-[plugins."io.containerd.cri.v1.runtime".containerd]
-  [plugins."io.containerd.cri.v1.runtime".containerd.runtimes]
-    [plugins."io.containerd.cri.v1.runtime".containerd.runtimes.runc]
-      runtime_type = "io.containerd.runc.v2"
-    [plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata]
-      runtime_type = "io.containerd.kata.v2"
-      [plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata.options]
-        ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration.toml"
-```
-
-+ In containerd 1.7.x
-
-```toml
-version = 2
-[plugins."io.containerd.grpc.v1.cri".containerd]
-  [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
-    [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
-      runtime_type = "io.containerd.runc.v2"
-    [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata]
-      runtime_type = "io.containerd.kata.v2"
-      [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata.options]
-        ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration.toml"
-```
-
 The following configuration includes two runtime classes:
-
-- `plugins.<X>.containerd.runtimes.runc`: the runc, and it is the default runtime.
-- `plugins.<X>.containerd.runtimes.kata`: The function in containerd (reference [the document here](https://github.com/containerd/containerd/tree/main/core/runtime/v2))
+- `plugins.cri.containerd.runtimes.runc`: the runc, and it is the default runtime.
+- `plugins.cri.containerd.runtimes.kata`: The function in containerd (reference [the document here](https://github.com/containerd/containerd/tree/main/core/runtime/v2))
   where the dot-connected string `io.containerd.kata.v2` is translated to `containerd-shim-kata-v2` (i.e. the
-  binary name of the Kata implementation of [Containerd Runtime V2 (Shim API)](https://github.com/containerd/containerd/tree/main/core/runtime/v2)). By default, the `containerd-shim-kata-v2` (short of `shimv2`) binary will be installed under the path of `/usr/local/bin/`.
-
-And `<X>` is `io.containerd.cri.v1.runtime` for containerd v2.x and `io.containerd.grpc.v1.cri` for containerd v1.7.x.
-
-+ In containerd 1.7.x
+  binary name of the Kata implementation of [Containerd Runtime V2 (Shim API)](https://github.com/containerd/containerd/tree/main/core/runtime/v2)).
 
 ```toml
     [plugins.cri.containerd]
@@ -187,7 +149,7 @@ And `<X>` is `io.containerd.cri.v1.runtime` for containerd v2.x and `io.containe
             CriuPath = ""
             CriuWorkPath = ""
             IoGid = 0
-      [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata]
+      [plugins.cri.containerd.runtimes.kata]
          runtime_type = "io.containerd.kata.v2"
          privileged_without_host_devices = true
          pod_annotations = ["io.katacontainers.*"]
@@ -196,71 +158,13 @@ And `<X>` is `io.containerd.cri.v1.runtime` for containerd v2.x and `io.containe
             ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration.toml"
 ```
 
-+ In containerd 2.x
-
-```toml
-    [plugins."io.containerd.cri.v1.runtime".containerd]
-      no_pivot = false
-    [plugins."io.containerd.cri.v1.runtime".containerd.runtimes]
-      [plugins."io.containerd.cri.v1.runtime".containerd.runtimes.runc]
-         privileged_without_host_devices = false
-         runtime_type = "io.containerd.runc.v2"
-        [plugins."io.containerd.cri.v1.runtime".containerd.runtimes.runc.options]
-            BinaryName = ""
-            CriuImagePath = ""
-            CriuPath = ""
-            CriuWorkPath = ""
-            IoGid = 0
-      [plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata]
-         runtime_type = "io.containerd.kata.v2"
-         privileged_without_host_devices = true
-         pod_annotations = ["io.katacontainers.*"]
-         container_annotations = ["io.katacontainers.*"]
-         [plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata.options]
-            ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration.toml"
-```
-
 `privileged_without_host_devices` tells containerd that a privileged Kata container should not have direct access to all host devices. If unset, containerd will pass all host devices to Kata container, which may cause security issues.
 
 `pod_annotations` is the list of pod annotations passed to both the pod sandbox as well as container through the OCI config.
 
 `container_annotations` is the list of container annotations passed through to the OCI config of the containers.
 
-This `ConfigPath` option is optional. If you want to use a different configuration file, you can specify the path of the configuration file with `ConfigPath` in the containerd configuration file. We use containerd 2.x configuration as an example here, and the configuration for containerd 1.7.x is similar, just replace `io.containerd.cri.v1.runtime` with `io.containerd.grpc.v1.cri`.
-
-```toml
-         [plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata.options]
-            ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration-qemu.toml"
-```
-
-> **Note:** In this example, the specified `ConfigPath` is valid in Kubernetes/Containerd workflow with containerd v1.7+ but doesn't work with ctr and nerdctl.
-
-If you do not specify it, `shimv2` first tries to get the configuration file from the environment variable `KATA_CONF_FILE`. If you want to adopt this way, you should first create a shell script as `containerd-shim-kata-v2` which is placed under the path of `/usr/local/bin/`. The following is an example of the shell script `containerd-shim-kata-qemu-v2` which specifies the configuration file with `KATA_CONF_FILE`
-
-> **Note:** Just use containerd 2.x configuration as an example, the configuration for containerd 1.7.x is similar, just replace `io.containerd.cri.v1.runtime` with `io.containerd.grpc.v1.cri`
-
-```shell
-~$ cat /usr/local/bin/containerd-shim-kata-qemu-v2
-#!/bin/bash
-KATA_CONF_FILE=/opt/kata/share/defaults/kata-containers/configuration-qemu.toml /opt/kata/bin/containerd-shim-kata-v2 "$@"
-```
-
-And then just reference it in the configuration of containerd:
-
-```toml
-      [plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata-qemu]
-         runtime_type = "io.containerd.kata-qemu.v2"
-```
-
-Finally you can run a Kata container with the runtime `io.containerd.kata-qemu.v2`:
-
-```shell
-$ sudo ctr run --cni --runtime io.containerd.kata-qemu.v2 -t --rm docker.io/library/busybox:latest hello sh
-```
-
-> **Note:** The `KATA_CONF_FILE` environment variable is valid in both Kubernetes/Containerd workflow with containerd and containerd tools(ctr, nerdctl, etc.) scenarios.
-
-If neither are set, shimv2 will use the default Kata configuration file paths (`/etc/kata-containers/configuration.toml` and `/usr/share/defaults/kata-containers/configuration.toml` and `/opt/kata/share/defaults/kata-containers/configuration.toml`).
+This `ConfigPath` option is optional. If you do not specify it, shimv2 first tries to get the configuration file from the environment variable `KATA_CONF_FILE`. If neither are set, shimv2 will use the default Kata configuration file paths (`/etc/kata-containers/configuration.toml` and `/usr/share/defaults/kata-containers/configuration.toml`).
 
 #### Kata Containers as the runtime for untrusted workload
 
@@ -269,20 +173,18 @@ for an untrusted workload. With the following configuration, you can run trusted
 and then, run an untrusted workload with Kata Containers:
 
 ```toml
-    [plugins."io.containerd.grpc.v1.cri".containerd]
-    # "plugins."io.containerd.grpc.v1.cri".containerd.default_runtime" is the runtime to use in containerd.
-    [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime]
+    [plugins.cri.containerd]
+    # "plugins.cri.containerd.default_runtime" is the runtime to use in containerd.
+    [plugins.cri.containerd.default_runtime]
       # runtime_type is the runtime type to use in containerd e.g. io.containerd.runtime.v1.linux
       runtime_type = "io.containerd.runtime.v1.linux"
 
-    # "plugins."io.containerd.grpc.v1.cri".containerd.untrusted_workload_runtime" is a runtime to run untrusted workloads on it.
-    [plugins."io.containerd.grpc.v1.cri".containerd.untrusted_workload_runtime]
+    # "plugins.cri.containerd.untrusted_workload_runtime" is a runtime to run untrusted workloads on it.
+    [plugins.cri.containerd.untrusted_workload_runtime]
       # runtime_type is the runtime type to use in containerd e.g. io.containerd.runtime.v1.linux
       runtime_type = "io.containerd.kata.v2"
 ```
 
-> **Note:** The `untrusted_workload_runtime` is deprecated since containerd v1.7.0, and it is recommended to use `RuntimeClass` instead.
-
 You can find more information on the [Containerd config documentation](https://github.com/containerd/containerd/blob/main/docs/cri/config.md)
 
 #### Kata Containers as the default runtime
@@ -290,8 +192,8 @@ You can find more information on the [Containerd config documentation](https://g
 If you want to set Kata Containers as the only runtime in the deployment, you can simply configure as follows:
 
 ```toml
-    [plugins."io.containerd.grpc.v1.cri".containerd]
-    [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime]
+    [plugins.cri.containerd]
+    [plugins.cri.containerd.default_runtime]
       runtime_type = "io.containerd.kata.v2"
 ```
 
@@ -344,14 +246,11 @@ debug: true
 
 ### Launch containers with `ctr` command line
 
-> **Note:** With containerd command tool `ctr`, the `ConfigPath` is not supported, and the configuration file should be explicitly specified with the option `--runtime-config-path`, otherwise, it'll use the default configurations.
-
 To run a container with Kata Containers through the containerd command line, you can run the following:
 
 ```bash
 $ sudo ctr image pull docker.io/library/busybox:latest
-$ CONFIG_PATH="/opt/kata/share/defaults/kata-containers/configuration-qemu.toml"
-$ sudo ctr run --cni --runtime io.containerd.kata.v2 --runtime-config-path $CONFIG_PATH -t --rm docker.io/library/busybox:latest hello sh
+$ sudo ctr run --cni --runtime io.containerd.run.kata.v2 -t --rm docker.io/library/busybox:latest hello sh
 ```
 
 This launches a BusyBox container named `hello`, and it will be removed by `--rm` after it quits.
@@ -361,9 +260,7 @@ loopback interface is created.
 ### Launch containers using `ctr` command line with rootfs bundle
 
 #### Get rootfs
-
 Use the script to create rootfs
-
 ```bash
 ctr i pull quay.io/prometheus/busybox:latest
 ctr i export rootfs.tar quay.io/prometheus/busybox:latest
@@ -381,9 +278,7 @@ for ((i=0;i<$(cat ${layers_dir}/manifest.json | jq -r ".[].Layers | length");i++
   tar -C ${rootfs_dir} -xf ${layers_dir}/$(cat ${layers_dir}/manifest.json | jq -r ".[].Layers[${i}]")
 done
 ```
-
 #### Get `config.json`
-
 Use runc spec to generate `config.json`
 ```bash
 cd ./bundle/rootfs
@@ -400,13 +295,10 @@ Change the root `path` in `config.json` to the absolute path of rootfs
 ```
 
 #### Run container
-
 ```bash
-CONFIG_PATH="/opt/kata/share/defaults/kata-containers/configuration-qemu.toml"
-sudo ctr run -d --runtime io.containerd.kata.v2 --runtime-config-path $CONFIG_PATH --config bundle/config.json hello
+sudo ctr run -d --runtime io.containerd.run.kata.v2 --config bundle/config.json hello
 sudo ctr t exec --exec-id ${ID} -t hello sh
 ```
-
 ### Launch Pods with `crictl` command line
 
 With the `crictl` command line of `cri-tools`, you can specify runtime class with `-r` or `--runtime` flag.

docs/how-to/how-to-run-kata-containers-with-SNP-VMs.md

@@ -18,7 +18,7 @@ The host kernel must be equal to or later than upstream version [6.11](https://c
 
 [`sev-utils`](https://github.com/amd/sev-utils/blob/coco-202501150000/docs/snp.md) is an easy way to install the required host kernel with the `setup-host` command. However, it will also build compatible guest kernel, OVMF, and QEMU components which are not necessary as these components are packaged with kata. The `sev-utils` script utility can be used with these additional components to test the memory encrypted launch and attestation of a base QEMU SNP guest.
 
-For a simplified way to build just the upstream compatible host kernel, use the Confidential Containers fork of [`amdese-amdsev`](https://github.com/confidential-containers/amdese-amdsev/tree/amd-snp-202501150000). Individual components can be built by running the following command:
+For a simplified way to build just the upstream compatible host kernel, use the Confidential Containers fork of [AMDESE AMDSEV](https://github.com/confidential-containers/amdese-amdsev/tree/amd-snp-202501150000). Individual components can be built by running the following command:
 
 ```
 ./build.sh kernel host --install
@@ -65,7 +65,7 @@ $ ./configure --enable-virtfs --target-list=x86_64-softmmu --enable-debug
 $ make -j "$(nproc)"
 $ popd
 ```
-- Create cert-chain for SNP attestation ( using [`snphost`](https://github.com/virtee/snphost/blob/main/docs/snphost.1.adoc) )
+- Create cert-chain for SNP attestation ( using [snphost](https://github.com/virtee/snphost/blob/main/docs/snphost.1.adoc) )
 ```bash
 $ git clone https://github.com/virtee/snphost.git && cd snphost/
 $ cargo build
@@ -96,10 +96,6 @@ path = "/path/to/qemu/build/qemu-system-x86_64"
 ```toml
 shared_fs = "virtio-9p"
 ```
-- Use `blockfile` snapshotter: Since virtio-fs remains unsupported due to bugs in QEMU snp-v3, and virtio-9p is no longer supported in runtime-rs, it is recommended to use the blockfile snapshotter. This allows container images to be managed via block devices without relying on a shared file system. To enable this, set the `snapshotter` to `blockfile` in the containerd config file, please refer to [blockfile guide](https://github.com/containerd/containerd/blob/main/docs/snapshotters/blockfile.md) for more information. Additionally, shared_fs should be set to "none" since no shared file system is used.
-```toml
-shared_fs = "none"
-```
 - Disable `virtiofsd` since it is no longer required (comment out)
 ```toml
 # virtio_fs_daemon = "/usr/libexec/virtiofsd"
@@ -182,3 +178,4 @@ sudo reboot
 ```bash
 sudo rmmod kvm_amd && sudo modprobe kvm_amd sev_snp=0
 ```
+

docs/how-to/how-to-run-kata-containers-with-kinds-of-Block-Volumes.md

@@ -12,11 +12,11 @@ Currently, there is no widely applicable and convenient method available for use
 
 According to the proposal, it requires to use the `kata-ctl direct-volume` command to add a direct assigned block volume device to the Kata Containers runtime.
 
-And then with the help of method [get_volume_mount_info](https://github.com/kata-containers/kata-containers/blob/099b4b0d0e3db31b9054e7240715f0d7f51f9a1c/src/libs/kata-types/src/mount.rs#L95), get information from JSON file: `(mountInfo.json)` and parse them into structure [Direct Volume Info](https://github.com/kata-containers/kata-containers/blob/099b4b0d0e3db31b9054e7240715f0d7f51f9a1c/src/libs/kata-types/src/mount.rs#L70) which is used to save device-related information.
+And then with the help of method [get_volume_mount_info](https://github.com/kata-containers/kata-containers/blob/099b4b0d0e3db31b9054e7240715f0d7f51f9a1c/src/libs/kata-types/src/mount.rs#L95), get information from JSON file: `(mountinfo.json)` and parse them into structure [Direct Volume Info](https://github.com/kata-containers/kata-containers/blob/099b4b0d0e3db31b9054e7240715f0d7f51f9a1c/src/libs/kata-types/src/mount.rs#L70) which is used to save device-related information.
 
-We only fill the `mountInfo.json`, such as `device` ,`volume-type`, `fstype`, `metadata` and `options`, which correspond to the fields in [Direct Volume Info](https://github.com/kata-containers/kata-containers/blob/099b4b0d0e3db31b9054e7240715f0d7f51f9a1c/src/libs/kata-types/src/mount.rs#L70), to describe a device.
+We only fill the `mountinfo.json`, such as `device` ,`volume_type`, `fs_type`, `metadata` and `options`, which correspond to the fields in [Direct Volume Info](https://github.com/kata-containers/kata-containers/blob/099b4b0d0e3db31b9054e7240715f0d7f51f9a1c/src/libs/kata-types/src/mount.rs#L70), to describe a device.
 
-The JSON file `mountInfo.json` placed in a sub-path `/kubelet/kata-test-vol-001/volume001` which under fixed path `/run/kata-containers/shared/direct-volumes/`.
+The JSON file `mountinfo.json` placed in a sub-path `/kubelet/kata-test-vol-001/volume001` which under fixed path `/run/kata-containers/shared/direct-volumes/`.
 And the full path looks like: `/run/kata-containers/shared/direct-volumes/kubelet/kata-test-vol-001/volume001`, But for some security reasons. it is
 encoded as `/run/kata-containers/shared/direct-volumes/L2t1YmVsZXQva2F0YS10ZXN0LXZvbC0wMDEvdm9sdW1lMDAx`.
 
@@ -47,18 +47,18 @@ $ sudo mkfs.ext4 /tmp/stor/rawdisk01.20g
 ```json
 {
   "device": "/tmp/stor/rawdisk01.20g",
-  "volume-type": "directvol",
-  "fstype": "ext4",
+  "volume_type": "directvol",
+  "fs_type": "ext4",
   "metadata":"{}",
   "options": []
 }
 ```
 
 ```bash
-$ sudo kata-ctl direct-volume add /kubelet/kata-direct-vol-002/directvol002 "{\"device\": \"/tmp/stor/rawdisk01.20g\", \"volume-type\": \"directvol\", \"fstype\": \"ext4\", \"metadata\":"{}", \"options\": []}"
+$ sudo kata-ctl direct-volume add /kubelet/kata-direct-vol-002/directvol002 "{\"device\": \"/tmp/stor/rawdisk01.20g\", \"volume_type\": \"directvol\", \"fs_type\": \"ext4\", \"metadata\":"{}", \"options\": []}"
 $# /kubelet/kata-direct-vol-002/directvol002 <==> /run/kata-containers/shared/direct-volumes/W1lMa2F0ZXQva2F0YS10a2F0DAxvbC0wMDEvdm9sdW1lMDAx
 $ cat W1lMa2F0ZXQva2F0YS10a2F0DAxvbC0wMDEvdm9sdW1lMDAx/mountInfo.json
-{"volume-type":"directvol","device":"/tmp/stor/rawdisk01.20g","fstype":"ext4","metadata":{},"options":[]}
+{"volume_type":"directvol","device":"/tmp/stor/rawdisk01.20g","fs_type":"ext4","metadata":{},"options":[]}
 ```
 
 #### Run a Kata container with direct block device volume
@@ -76,7 +76,7 @@ $ sudo ctr run -t --rm --runtime io.containerd.kata.v2 --mount type=directvol,sr
 > **Tip:** It only supports `vfio-pci` based PCI device passthrough mode.
 
 In this scenario, the device's host kernel driver will be replaced by `vfio-pci`, and IOMMU group ID generated.
-And either device's BDF or its VFIO IOMMU group ID in `/dev/vfio/` is fine for "device" in `mountInfo.json`.
+And either device's BDF or its VFIO IOMMU group ID in `/dev/vfio/` is fine for "device" in `mountinfo.json`.
 
 ```bash
 $ lspci -nn -k -s 45:00.1
@@ -92,15 +92,15 @@ $ ls /sys/kernel/iommu_groups/110/devices/
 
 #### setup VFIO device for kata-containers
 
-First, configure the `mountInfo.json`, as below:
+First, configure the `mountinfo.json`, as below:
 
 - (1) device with `BB:DD:F`
 
 ```json
 {
   "device": "45:00.1",
-  "volume-type": "vfiovol",
-  "fstype": "ext4",
+  "volume_type": "vfiovol",
+  "fs_type": "ext4",
   "metadata":"{}",
   "options": []
 }
@@ -111,8 +111,8 @@ First, configure the `mountInfo.json`, as below:
 ```json
 {
   "device": "0000:45:00.1",
-  "volume-type": "vfiovol",
-  "fstype": "ext4",
+  "volume_type": "vfiovol",
+  "fs_type": "ext4",
   "metadata":"{}",
   "options": []
 }
@@ -123,8 +123,8 @@ First, configure the `mountInfo.json`, as below:
 ```json
 {
   "device": "/dev/vfio/110",
-  "volume-type": "vfiovol",
-  "fstype": "ext4",
+  "volume_type": "vfiovol",
+  "fs_type": "ext4",
   "metadata":"{}",
   "options": []
 }
@@ -133,10 +133,10 @@ First, configure the `mountInfo.json`, as below:
 Second, run kata-containers with device(`/dev/vfio/110`) as an example:
 
 ```bash
-$ sudo kata-ctl direct-volume add /kubelet/kata-vfio-vol-003/vfiovol003 "{\"device\": \"/dev/vfio/110\", \"volume-type\": \"vfiovol\", \"fstype\": \"ext4\", \"metadata\":"{}", \"options\": []}"
+$ sudo kata-ctl direct-volume add /kubelet/kata-vfio-vol-003/vfiovol003 "{\"device\": \"/dev/vfio/110\", \"volume_type\": \"vfiovol\", \"fs_type\": \"ext4\", \"metadata\":"{}", \"options\": []}"
 $ # /kubelet/kata-vfio-vol-003/directvol003 <==> /run/kata-containers/shared/direct-volumes/F0va22F0ZvaS12F0YS10a2F0DAxvbC0F0ZXvdm9sdF0Z0YSx
 $ cat F0va22F0ZvaS12F0YS10a2F0DAxvbC0F0ZXvdm9sdF0Z0YSx/mountInfo.json
-{"volume-type":"vfiovol","device":"/dev/vfio/110","fstype":"ext4","metadata":{},"options":[]}
+{"volume_type":"vfiovol","device":"/dev/vfio/110","fs_type":"ext4","metadata":{},"options":[]}
 ```
 
 #### Run a Kata container with VFIO block device based volume
@@ -190,25 +190,25 @@ be passed to Hypervisor, such as Dragonball, Cloud-Hypervisor, Firecracker or QE
 
 First, `mkdir` a sub-path `kubelet/kata-test-vol-001/` under `/run/kata-containers/shared/direct-volumes/`.
 
-Second, fill fields in `mountInfo.json`, it looks like as below:
+Second, fill fields in `mountinfo.json`, it looks like as below:
 ```json
 {
   "device": "/tmp/vhu-targets/vhost-blk-rawdisk01.sock",
-  "volume-type": "spdkvol",
-  "fstype": "ext4",
+  "volume_type": "spdkvol",
+  "fs_type": "ext4",
   "metadata":"{}",
   "options": []
 }
 ```
 
-Third, with the help of `kata-ctl direct-volume` to add block device to generate `mountInfo.json`, and run a kata container with `--mount`.
+Third, with the help of `kata-ctl direct-volume` to add block device to generate `mountinfo.json`, and run a kata container with `--mount`.
 
 ```bash
 $ # kata-ctl direct-volume add
-$ sudo kata-ctl direct-volume add /kubelet/kata-test-vol-001/volume001 "{\"device\": \"/tmp/vhu-targets/vhost-blk-rawdisk01.sock\", \"volume-type\":\"spdkvol\", \"fstype\": \"ext4\", \"metadata\":"{}", \"options\": []}"
+$ sudo kata-ctl direct-volume add /kubelet/kata-test-vol-001/volume001 "{\"device\": \"/tmp/vhu-targets/vhost-blk-rawdisk01.sock\", \"volume_type\":\"spdkvol\", \"fs_type\": \"ext4\", \"metadata\":"{}", \"options\": []}"
 $ # /kubelet/kata-test-vol-001/volume001 <==> /run/kata-containers/shared/direct-volumes/L2t1YmVsZXQva2F0YS10ZXN0LXZvbC0wMDEvdm9sdW1lMDAx
 $ cat L2t1YmVsZXQva2F0YS10ZXN0LXZvbC0wMDEvdm9sdW1lMDAx/mountInfo.json
-$ {"volume-type":"spdkvol","device":"/tmp/vhu-targets/vhost-blk-rawdisk01.sock","fstype":"ext4","metadata":{},"options":[]}
+$ {"volume_type":"spdkvol","device":"/tmp/vhu-targets/vhost-blk-rawdisk01.sock","fs_type":"ext4","metadata":{},"options":[]}
 ```
 
 As `/run/kata-containers/shared/direct-volumes/` is a fixed path , we will be able to run a kata pod with `--mount` and set

docs/how-to/how-to-set-prometheus-in-k8s.md

@@ -17,7 +17,7 @@ You must have a running Kubernetes cluster first. If not, [install a Kubernetes
 Also you should ensure that `kubectl` working correctly.
 
 > **Note**: More information about Kubernetes integrations:
->   - [Run Kata Containers with Kubernetes](how-to-use-k8s-with-crio-and-kata.md)
+>   - [Run Kata Containers with Kubernetes](run-kata-with-k8s.md)
 >   - [How to use Kata Containers and Containerd](containerd-kata.md)
 >   - [How to use Kata Containers and containerd with Kubernetes](how-to-use-k8s-with-containerd-and-kata.md)
 

docs/how-to/how-to-set-sandbox-config-kata.md

@@ -46,8 +46,6 @@ There are several kinds of Kata configurations and they are listed below.
 | `io.katacontainers.config.hypervisor.block_device_cache_noflush` | `boolean` | Denotes whether flush requests for the device are ignored |
 | `io.katacontainers.config.hypervisor.block_device_cache_set` | `boolean` | cache-related options will be set to block devices or not |
 | `io.katacontainers.config.hypervisor.block_device_driver` | string | the driver to be used for block device, valid values are `virtio-blk`, `virtio-scsi`, `nvdimm`|
-| `io.katacontainers.config.hypervisor.blk_logical_sector_size` | uint32 | logical sector size in bytes reported by block devices to the guest (0 = hypervisor default, must be a power of 2 between 512 and 65536) |
-| `io.katacontainers.config.hypervisor.blk_physical_sector_size` | uint32 | physical sector size in bytes reported by block devices to the guest (0 = hypervisor default, must be a power of 2 between 512 and 65536) |
 | `io.katacontainers.config.hypervisor.cpu_features` | `string` | Comma-separated list of CPU features to pass to the CPU (QEMU) |
 | `io.katacontainers.config.hypervisor.default_max_vcpus` | uint32| the maximum number of vCPUs allocated for the VM by the hypervisor |
 | `io.katacontainers.config.hypervisor.default_memory` | uint32| the memory assigned for a VM by the hypervisor in `MiB` |

docs/how-to/how-to-use-memory-agent.md

@@ -315,7 +315,7 @@ $ kata-agent-ctl connect --server-address "unix:///var/run/kata/$PODID/root/kata
 ### compact_threshold
 Control the mem-agent compaction function compact threshold.<br>
 compact_threshold is the pages number.<br>
-When examining the `/proc/pagetypeinfo`, if there's an increase in the number of movable pages of orders smaller than the compact_order compared to the amount following the previous compaction period, and this increase surpasses a certain threshold specifically, more than compact_threshold number of pages, or the number of free pages has decreased by compact_threshold since the previous compaction. Current compact run period will not do compaction because there is no enough fragmented pages to be compaction.<br>
+When examining the /proc/pagetypeinfo, if there's an increase in the number of movable pages of orders smaller than the compact_order compared to the amount following the previous compaction period, and this increase surpasses a certain threshold specifically, more than compact_threshold number of pages, or the number of free pages has decreased by compact_threshold since the previous compaction. Current compact run period will not do compaction because there is no enough fragmented pages to be compaction.<br>
 This design aims to minimize the impact of unnecessary compaction calls on system performance.<br>
 Default to 1024.
 

docs/how-to/how-to-use-passthroughfd-io-within-runtime-rs.md

@@ -1,159 +0,0 @@
-# How to Use Passthrough-FD IO within Runtime-rs and Dragonball
-
-This document describes the Passthrough-FD (pass-fd) technology implemented in Kata Containers to optimize IO performance. By bypassing the intermediate proxy layers, this technology significantly reduces latency and CPU overhead for container IO streams.
-
-## Important Limitation
-
-Before diving into the technical details, please note the following restriction:
-
-- Exclusive Support for Dragonball VMM: This feature is currently implemented only for Kata Containers' built-in VMM, Dragonball.
-- Unsupported VMMs: Other VMMs such as QEMU, Cloud Hypervisor, and Firecracker do not support this feature at this time.
-
-## Overview
-
-The original IO implementation in Kata Containers suffered from an excessively long data path, leading to poor efficiency. For instance, copying a 10GB file could take as long as 10 minutes.
-
-To address this, Kata AC member @lifupan and @frezcirno introduced a series of optimizations using passthrough-fd technology. This approach allows the VMM to directly handle file descriptors (FDs), dramatically improving IO throughput.
-
-## Traditional IO Path
-
-Before the introduction of Passthrough-FD, Kata's IO streams were implemented using `ttrpc + virtio-vsock`.
-
-The data flow was as follows:
-
-```mermaid
-graph LR
-    subgraph Host ["Host"]
-        direction LR
-        Containerd["Containerd"]
-
-        subgraph KS ["kata-shim"]
-            buffer(("buffer"))
-        end
-
-        Vsock["vsock"]
-
-        subgraph VM ["vm"]
-            Agent["kata-agent"]
-            Container["container"]
-        end
-    end
-
-    Containerd -->|stdin| buffer
-    buffer --> Vsock
-    Vsock --> Agent
-    Agent -.-> Container
-
-    %% Style Rendering
-    style Host fill:#f0f8ff,stroke:#333,stroke-dasharray: 5 5
-    style VM fill:#fff9c4,stroke:#e0e0e0
-    style buffer fill:#c8e6c9,stroke:#ff9800,stroke-dasharray: 5 5
-    style Vsock fill:#bbdefb,stroke:#2196f3
-    style Containerd fill:#f5f5f5,stroke:#333
-    style Agent fill:#fff,stroke:#333
-    style Container fill:#fff,stroke:#333
-
-```
-
-The kata-shim (containerd-shim-kata-v2) on the Host opens the FIFO pipes provided by containerd via the shimv2 interface.
-This results in three FDs (stdin, stdout, and stderr).
-The kata-shim manages three separate threads to handle these streams.
-The Bottleneck: kata-shim acts as a "middleman," maintaining three internal buffers. It must read data from the FDs into its own buffers before forwarding them via ttrpc over vsock to the destination.
-This multi-threaded proxying and buffering in the shim layer introduced significant overhead.
-
-
-## What is Passthrough-FD?
-
-Passthrough-FD technology enhances the Dragonball VMM's hybrid-vsock implementation with support for recv-fd.
-
-```mermaid
-graph LR
-    subgraph Host ["Host"]
-        direction LR
-        Containerd["Containerd"]
-
-        Vsock["vsock"]
-
-        subgraph VM ["vm"]
-            Agent["kata-agent"]
-            Container["container"]
-        end
-    end
-
-    Containerd -->|stdin| Vsock
-    Vsock --> Agent
-    Agent -.-> Container
-
-    %% Style Rendering
-    style Host fill:#f0f8ff,stroke:#333,stroke-dasharray: 5 5
-    style VM fill:#fff9c4,stroke:#e0e0e0
-    style Vsock fill:#bbdefb,stroke:#2196f3
-    style Containerd fill:#f5f5f5,stroke:#333
-    style Agent fill:#fff,stroke:#333
-    style Container fill:#fff,stroke:#333
-```
-
-Instead of requiring an intermediate layer to read and forward data, the hybrid-vsock module can now directly receive file descriptors from the Host. This allows the system to "pass through" the host's FDs directly to the kata-agent. By eliminating the proxying logic in kata-shim, the IO stream is effectively connected directly to the guest environment.
-
-## Technical Details
-
-The end-to-end process follows these steps:
-
-```mermaid
-sequenceDiagram
-    autonumber
-
-    box rgb(220,235,255) Guest (VM)
-        participant Agent as kata-agent<br/>(Server)
-        participant VSOCK as AF_VSOCK socket<br/>(Hybrid Vsock)
-    end
-
-    box rgb(255,240,220) Host
-        participant Shim as kata-shim<br/>(Client)
-        participant FIFO as File or FIFO<br/>(stdin/stdout/stderr)
-    end
-
-    Note over Agent: Agent Initialization:<br/>listen() on passfd_listener_port
-
-    Shim->>FIFO: open() to acquire Fd<br/>(for stdin / stdout / stderr)
-
-    Shim->>VSOCK: connect() + send("passfd\n")<br/>+ send_with_fd(Fd, PortA)
-
-    Note over VSOCK,Agent: FD Transfer via Hybrid Vsock<br/>(repeat for stdin-port, stdout-port, stderr-port)
-
-    VSOCK->>Agent: forward connection + Fd + PortA
-
-    Agent->>Agent: accept() → get conn_fd + host-port<br/>save: map[host-port] = conn_fd<br/>(3 entries: stdin-port, stdout-port, stderr-port)
-
-    Shim->>Agent: create_container RPC<br/>(includes stdin-port, stdout-port, stderr-port)
-
-    Agent->>Agent: lookup map[stdin-port] → bind to container stdin<br/>lookup map[stdout-port] → bind to container stdout<br/>lookup map[stderr-port] → bind to container stderr
-
-    Agent-->>Shim: create_container RPC response (OK)
-```
-
-1. Agent Initialization: The kata-agent starts a server listening on the port specified by passfd_listener_port.
-2. FD Transfer: During the container creation phase, the kata-shim sends the FDs for stdin, stdout, and stderr to the Dragonball hybrid-vsock module using the sendfd mechanism.
-3. Connection Establishment: Through hybrid-vsock, these FDs connect to the server started by the agent in Step 1.
-4. Identification: The agent's server calls accept() to obtain the connection FD and a corresponding host-port. It saves the connection using the host-port as a unique identifier. At this stage, the agent has three established connections (identified by stdin-port, stdout-port, and stderr-port).
-5. RPC Mapping: When kata-shim invokes the create_container RPC, it includes these three port identifiers in the request.
-6. Final Binding: Upon receiving the RPC, the agent retrieves the saved connections using the provided ports and binds them directly to the container's standard IO streams.
-
-
-## How to enable PassthroughFD IO within Configuration?
-
-The Passthrough-FD feature is controlled by two main parameters in the Kata configuration file:
-
-- use_passfd_io: A boolean flag to enable or disable the Passthrough-FD IO feature.
-- passfd_listener_port: Specifies the port on which the kata-agent listens for FD connections. The default value is 1027.
-To enable Passthrough-FD IO, set use_passfd_io to true in the configuration file:
-
-```toml
-...
-# If enabled, the runtime will attempt to use fd passthrough feature for process io.
-# Note: this feature is only supported by the Dragonball hypervisor.
-use_passfd_io = true
-
-# If fd passthrough io is enabled, the runtime will attempt to use the specified port instead of the default port.
-passfd_listener_port = 1027
-```

docs/how-to/privileged.md

@@ -73,5 +73,5 @@ See below example config:
   privileged_without_host_devices = true
 ```
 
- - [Kata Containers with CRI-O](../how-to/how-to-use-k8s-with-crio-and-kata.md#cri-o)
+ - [Kata Containers with CRI-O](../how-to/run-kata-with-k8s.md#cri-o)
 

docs/how-to/run-kata-with-crictl.md

@@ -8,7 +8,7 @@
 
 > **Note:** `cri-tools` is only used for debugging and validation purpose, and don't use it to run production workloads.
 
-> **Note:** For how to install and configure `cri-tools` with CRI runtimes like `containerd` or CRI-O, please also refer to other [how-tos](./README.md).
+> **Note:** For how to install and configure `cri-tools` with CRI runtimes like `containerd` or CRI-O, please also refer to other [howtos](./README.md).
 
 ## Use `crictl` run Pods in Kata containers
 

docs/how-to/run-kata-with-k8s.md

@@ -1,7 +1,6 @@
-# How to use Kata Containers and CRI-O with Kubernetes
+# Run Kata Containers with Kubernetes
 
 ## Prerequisites
-
 This guide requires Kata Containers available on your system, install-able by following [this guide](../install/README.md).
 
 ## Install a CRI implementation
@@ -10,16 +9,22 @@ Kubernetes CRI (Container Runtime Interface) implementations allow using any
 OCI-compatible runtime with Kubernetes, such as the Kata Containers runtime.
 
 Kata Containers support both the [CRI-O](https://github.com/kubernetes-incubator/cri-o) and
-[containerd](https://github.com/containerd/containerd) CRI implementations. We choose `CRI-O` for our examples in this guide.
+[containerd](https://github.com/containerd/containerd) CRI implementations.
+
+After choosing one CRI implementation, you must make the appropriate configuration
+to ensure it integrates with Kata Containers.
+
+Kata Containers 1.5 introduced the `shimv2` for containerd 1.2.0, reducing the components
+required to spawn pods and containers, and this is the preferred way to run Kata Containers with Kubernetes ([as documented here](../how-to/how-to-use-k8s-with-containerd-and-kata.md#configure-containerd-to-use-kata-containers)).
+
+An equivalent shim implementation for CRI-O is planned.
 
 ### CRI-O
-
 For CRI-O installation instructions, refer to the [CRI-O Tutorial](https://github.com/cri-o/cri-o/blob/main/tutorial.md) page.
 
 The following sections show how to set up the CRI-O snippet configuration file (default path: `/etc/crio/crio.conf`) for Kata.
 
 Unless otherwise stated, all the following settings are specific to the `crio.runtime` table:
-
 ```toml
 # The "crio.runtime" table contains settings pertaining to the OCI
 # runtime used and options for how to set up and manage the OCI runtime.
@@ -28,17 +33,16 @@ Unless otherwise stated, all the following settings are specific to the `crio.ru
 A comprehensive documentation of the configuration file can be found [here](https://github.com/cri-o/cri-o/blob/main/docs/crio.conf.5.md).
 
 > **Note**: After any change to this file, the CRI-O daemon have to be restarted with:
-
 >````
 >$ sudo systemctl restart crio
 >````
 
 #### Kubernetes Runtime Class (CRI-O v1.12+)
-
 The [Kubernetes Runtime Class](https://kubernetes.io/docs/concepts/containers/runtime-class/)
 is the preferred way of specifying the container runtime configuration to run a Pod's containers.
-To use this feature, Kata must added as a runtime handler. This can be done by dropping a `50-kata`
-snippet file into `/etc/crio/crio.conf.d`, with the content shown below:
+To use this feature, Kata must added as a runtime handler. This can be done by
+dropping a `50-kata` snippet file into `/etc/crio/crio.conf.d`, with the
+content shown below:
 
 ```toml
 [crio.runtime.runtimes.kata]
@@ -48,6 +52,13 @@ snippet file into `/etc/crio/crio.conf.d`, with the content shown below:
 	privileged_without_host_devices = true
 ```
 
+
+### containerd
+
+To customize containerd to select Kata Containers runtime, follow our
+"Configure containerd to use Kata Containers" internal documentation
+[here](../how-to/how-to-use-k8s-with-containerd-and-kata.md#configure-containerd-to-use-kata-containers).
+
 ## Install Kubernetes
 
 Depending on what your needs are and what you expect to do with Kubernetes,
@@ -61,16 +72,25 @@ implementation you chose, and the Kubelet service has to be updated accordingly.
 ### Configure for CRI-O
 
 `/etc/systemd/system/kubelet.service.d/0-crio.conf`
-
 ```
 [Service]
 Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///var/run/crio/crio.sock"
 ```
 
+### Configure for containerd
+
+`/etc/systemd/system/kubelet.service.d/0-cri-containerd.conf`
+```
+[Service]
+Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
+```
+For more information about containerd see the "Configure Kubelet to use containerd"
+documentation [here](../how-to/how-to-use-k8s-with-containerd-and-kata.md#configure-kubelet-to-use-containerd).
+
 ## Run a Kubernetes pod with Kata Containers
 
-After you update your Kubelet service based on the CRI implementation you are using, reload and restart Kubelet. Then, start your cluster:
-
+After you update your Kubelet service based on the CRI implementation you
+are using, reload and restart Kubelet. Then, start your cluster:
 ```bash
 $ sudo systemctl daemon-reload
 $ sudo systemctl restart kubelet
@@ -78,6 +98,12 @@ $ sudo systemctl restart kubelet
 # If using CRI-O
 $ sudo kubeadm init --ignore-preflight-errors=all --cri-socket /var/run/crio/crio.sock --pod-network-cidr=10.244.0.0/16
 
+# If using containerd
+$ cat <<EOF | tee kubeadm-config.yaml
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: InitConfiguration
+nodeRegistration:
+  criSocket: "/run/containerd/containerd.sock"
 ---
 kind: KubeletConfiguration
 apiVersion: kubelet.config.k8s.io/v1beta1
@@ -92,7 +118,6 @@ $ export KUBECONFIG=/etc/kubernetes/admin.conf
 ### Allow pods to run in the control-plane node
 
 By default, the cluster will not schedule pods in the control-plane node. To enable control-plane node scheduling:
-
 ```bash
 $ sudo -E kubectl taint nodes --all node-role.kubernetes.io/control-plane-
 ```
@@ -136,7 +161,6 @@ If a pod has the `runtimeClassName` set to `kata`, the CRI plugin runs the pod w
   ```
 
 - Create the pod
-
   ```bash
   $ sudo -E kubectl apply -f nginx-kata.yaml
   ```
@@ -148,7 +172,6 @@ If a pod has the `runtimeClassName` set to `kata`, the CRI plugin runs the pod w
   ```
 
 - Check hypervisor is running
-
   ```bash
   $ ps aux | grep qemu
   ```

docs/hypervisors.md

@@ -16,38 +16,83 @@ which hypervisors you may wish to investigate further.
 
 ## Types
 
-| Hypervisor | Written in | Architectures | GPU Support | Intel TDX | AMD SEV-SNP |
-|-|-|-|-|-|-|
-|[Cloud Hypervisor](#cloud-hypervisor) | rust | `aarch64`, `x86_64` | :x: | :x: | :x: |
-|[Firecracker](#firecracker) | rust | `aarch64`, `x86_64` | :x: | :x: | :x: |
-|[QEMU](#qemu) | C | all | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-|[Dragonball](#dragonball) | rust | `aarch64`, `x86_64` | :x: | :x: | :x: |
-|StratoVirt | rust | `aarch64`, `x86_64` | :x: | :x: | :x: |
+| Hypervisor | Written in | Architectures | Type |
+|-|-|-|-|
+|[Cloud Hypervisor] | rust | `aarch64`, `x86_64` | Type 2 ([KVM]) |
+|[Firecracker] | rust | `aarch64`, `x86_64` | Type 2 ([KVM]) |
+|[QEMU] | C | all | Type 2 ([KVM]) | `configuration-qemu.toml` |
+|[`Dragonball`] | rust | `aarch64`, `x86_64` | Type 2 ([KVM]) |
+|[StratoVirt] | rust | `aarch64`, `x86_64` | Type 2 ([KVM]) |
 
-Each Kata runtime is configured for a specific hypervisor through the runtime's configuration file. For example:
+## Determine currently configured hypervisor
 
-```toml title="/opt/kata/share/defaults/kata-containers/configuration.toml"
-[hypervisor.qemu]
-path = "/opt/kata/bin/qemu-system-x86_64"
+```bash
+$ kata-runtime kata-env | awk -v RS= '/\[Hypervisor\]/' | grep Path
 ```
 
-```toml title="/opt/kata/share/defaults/kata-containers/configuration-clh.toml"
-[hypervisor.clh]
-path = "/opt/kata/bin/cloud-hypervisor"
-```
+## Choose a Hypervisor
 
-## Cloud Hypervisor
+The table below provides a brief summary of some of the differences between
+the hypervisors:
 
-[Cloud Hypervisor](https://www.cloudhypervisor.org/) is a more modern hypervisor written in Rust.
+| Hypervisor | Summary | Features | Limitations | Container Creation speed | Memory density | Use cases | Comment |
+|-|-|-|-|-|-|-|-|
+|[Cloud Hypervisor] | Low latency, small memory footprint, small attack surface | Minimal | | excellent | excellent | High performance modern cloud workloads | |
+|[Firecracker] | Very slimline | Extremely minimal | Doesn't support all device types | excellent | excellent | Serverless / FaaS | |
+|[QEMU] | Lots of features | Lots | | good | good | Good option for most users | |
+|[`Dragonball`] | Built-in VMM,  low CPU and memory overhead| Minimal | | excellent | excellent | Optimized for most container workloads | `out-of-the-box` Kata Containers experience |
+|[StratoVirt] | Unified architecture supporting three scenarios: VM, container, and serverless | Extremely minimal(`MicroVM`) to Lots(`StandardVM`) | | excellent | excellent | Common container workloads | `StandardVM` type of StratoVirt for Kata is under development |
 
-## Firecracker
+For further details, see the [Virtualization in Kata Containers](design/virtualization.md) document and the official documentation for each hypervisor.
 
-[Firecracker](https://firecracker-microvm.github.io/) is a minimal and lightweight hypervisor created for the AWS Lambda product.
+## Hypervisor configuration files
 
-## QEMU
+Since each hypervisor offers different features and options, Kata Containers
+provides a separate
+[configuration file](../src/runtime/README.md#configuration)
+for each. The configuration files contain comments explaining which options
+are available, their default values and how each setting can be used.
 
-QEMU is the best supported hypervisor for NVIDIA-based GPUs and for confidential computing use-cases (such as Intel TDX and AMD SEV-SNP). Runtimes that use this are normally named `kata-qemu-nvidia-gpu-*`. The Kata project focuses primarily on QEMU runtimes for GPU support.
+| Hypervisor | Golang runtime config file | golang runtime short name | golang runtime default | rust runtime config file | rust runtime short name | rust runtime default |
+|-|-|-|-|-|-|-|
+| [Cloud Hypervisor] | [`configuration-clh.toml`](../src/runtime/config/configuration-clh.toml.in) | `clh` | | [`configuration-cloud-hypervisor.toml`](../src/runtime-rs/config/configuration-cloud-hypervisor.toml.in) | `cloud-hypervisor` | |
+| [Firecracker] | [`configuration-fc.toml`](../src/runtime/config/configuration-fc.toml.in) | `fc` | | | | |
+| [QEMU] | [`configuration-qemu.toml`](../src/runtime/config/configuration-qemu.toml.in) | `qemu` | yes | [`configuration-qemu.toml`](../src/runtime-rs/config/configuration-qemu-runtime-rs.toml.in) | `qemu` | |
+| [`Dragonball`] | | | | [`configuration-dragonball.toml`](../src/runtime-rs/config/configuration-dragonball.toml.in) | `dragonball` | yes |
+| [StratoVirt] | [`configuration-stratovirt.toml`](../src/runtime/config/configuration-stratovirt.toml.in) | `stratovirt` | | | | |
 
-## Dragonball
+> **Notes:**
+>
+> - The short names specified are used by the [`kata-manager`](../utils/README.md) tool.
+> - As shown by the default columns, each runtime type has its own default hypervisor.
+> - The [golang runtime](../src/runtime) is the current default runtime.
+> - The [rust runtime](../src/runtime-rs), also known as `runtime-rs`,
+>   is the newer runtime written in the rust language.
+> - See the [Configuration](../README.md#configuration) for further details.
+> - The configuration file links in the table link to the "source"
+>   versions: these are not usable configuration files as they contain
+>   variables that need to be expanded:
+>   - The links are provided for reference only.
+>   - The final (installed) versions, where all variables have been
+>     expanded, are built from these source configuration files.
+> - The pristine configuration files are usually installed in the
+>   `/opt/kata/share/defaults/kata-containers/` or
+>   `/usr/share/defaults/kata-containers/` directories.
+> - Some hypervisors may have the same name for both golang and rust
+>   runtimes, but the file contents may differ.
+> - If there is no configuration file listed for the golang or
+>   rust runtimes, this either means the hypervisor cannot be run with
+>   a particular runtime, or that a driver has not yet been made
+>   available for that runtime.
 
-Dragonball is a special hypervisor created by the Ant Group that runs in the same process as the Rust-based containerd shim.
+## Switch configured hypervisor
+
+To switch the configured hypervisor, you only need to run a single command.
+See [the `kata-manager` documentation](../utils/README.md#choose-a-hypervisor) for further details.
+
+[Cloud Hypervisor]: https://github.com/cloud-hypervisor/cloud-hypervisor
+[Firecracker]: https://github.com/firecracker-microvm/firecracker
+[KVM]: https://en.wikipedia.org/wiki/Kernel-based_Virtual_Machine
+[QEMU]: http://www.qemu.org
+[`Dragonball`]: https://github.com/kata-containers/kata-containers/blob/main/src/dragonball
+[StratoVirt]: https://gitee.com/openeuler/stratovirt

docs/index.md

@@ -1,94 +0,0 @@
-# Kata Containers
-
-Kata Containers is an open source community working to build a secure container runtime with lightweight virtual machines (VM's) that feel and perform like standard Linux containers, but provide stronger workload isolation using hardware virtualization technology as a second layer of defense.
-
-## How it Works
-
-Kata implements the [Open Containers Runtime Specification](https://github.com/opencontainers/runtime-spec). More specifically, it implements a containerd shim that implements the expected interface for managing container lifecycles. The default containerd runtime of `runc` spawns a container like this:
-
-```mermaid
-flowchart TD
-    subgraph Host
-        containerd
-        runc
-        process[Container Process]
-        containerd --> runc --> process
-    end
-```
-
-When containerd receives a request to spawn a container, it will pull the container image down and then call out to the runc shim (usually located at `/usr/local/bin/containerd-shim-runc-v2`). runc will then create various process isolation resources like Linux namespaces (networking, PIDs, mounts etc), seccomp filters, Linux capability reductions, and then spawn the process inside of those resources. This process runs in the host kernel.
-
-Kata spawns containers like this:
-
-```mermaid
-flowchart TD
-    subgraph Host
-        containerdOuter[containerd]
-        kata
-
-        containerdOuter --> kata
-        kata --> kataAgent
-
-        subgraph VM
-            kataAgent[Kata Agent]
-            process[Container Process]
-            kataAgent --> process
-        end
-    end
-```
-
-The container process spawned inside of the VM allows us to isolate the guest kernel from the host system. This is the fundamental principle of how Kata achieves its isolation boundaries.
-
-## Example
-
-When Kata is installed in a system, a number of artifacts are laid down. containerd's config will be modified as such:
-
-```toml title="/etc/containerd/config.toml"
-imports = ["/opt/kata/containerd/config.d/kata-deploy.toml"]
-```
-
-This file will contain configuration for various flavors of Kata runtimes. We can see the vanilla CPU runtime config here:
-
-```toml title="/opt/kata/containerd/config.d/kata-deploy.toml"
-[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata-qemu]
-runtime_type = "io.containerd.kata-qemu.v2"
-runtime_path = "/opt/kata/bin/containerd-shim-kata-v2"
-privileged_without_host_devices = true
-pod_annotations = ["io.katacontainers.*"]
-
-[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata-qemu.options]
-ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration-qemu.toml"
-```
-
-Because containerd's CRI is aware of the Kata runtimes, we can spawn Kubernetes pods:
-
-```yaml
-apiVersion: v1
-kind: Pod
-metadata:
-  name: test
-spec:
-  runtimeClassName: kata-qemu
-  containers:
-    - name: test
-      image: "quay.io/libpod/ubuntu:latest"
-      command: ["/bin/bash", "-c"]
-      args: ["echo hello"]
-```
-
-We can also spawn a Kata container by submitting a request to containerd like so:
-
-<div class="annotate" markdown>
-
-```sh
-$ ctr image pull quay.io/libpod/ubuntu:latest
-$ ctr run --runtime "io.containerd.kata.v2" --runtime-config-path /opt/kata/share/defaults/kata-containers/configuration-qemu.toml --rm -t "quay.io/libpod/ubuntu:latest" foo sh
-# echo hello
-hello
-```
-
-</div>
-
-!!! tip
-
-    `ctr` is not aware of the CRI config in `/etc/containerd/config.toml`. This is why you must specify the `--runtime-config-path`. Additionally, the `--runtime` value is converted into a specific binary name which containerd then searches for in its `PATH`. See the [containerd docs](https://github.com/containerd/containerd/blob/release/2.2/core/runtime/v2/README.md#usage) for more details.

docs/install/README.md

@@ -18,3 +18,6 @@ artifacts required to run Kata Containers on Kubernetes.
 * [upgrading document](../Upgrading.md)
 * [developer guide](../Developer-Guide.md)
 * [runtime documentation](../../src/runtime/README.md)
+
+## Kata Containers 3.0 rust runtime installation
+* [installation guide](../install/kata-containers-3.0-rust-runtime-installation-guide.md)

docs/install/kata-containers-3.0-rust-runtime-installation-guide.md

@@ -0,0 +1,116 @@
+# Kata Containers 3.0 rust runtime installation
+The following is an overview of the different installation methods available.
+
+## Prerequisites
+
+Kata Containers 3.0 rust runtime requires nested virtualization or bare metal. Check
+[hardware requirements](/src/runtime/README.md#hardware-requirements) to see if your system is capable of running Kata
+Containers.
+
+### Platform support
+
+Kata Containers 3.0 rust runtime currently runs on 64-bit systems supporting the following
+architectures:
+
+> **Notes:**
+> For other architectures, see https://github.com/kata-containers/kata-containers/issues/4320
+
+| Architecture | Virtualization technology |
+|-|-|
+| `x86_64`| [Intel](https://www.intel.com) VT-x |
+| `aarch64` ("`arm64`")| [ARM](https://www.arm.com) Hyp |
+
+## Packaged installation methods
+
+| Installation method                                  | Description                                                                                  | Automatic updates | Use case                                                                                      | Availability
+|------------------------------------------------------|----------------------------------------------------------------------------------------------|-------------------|-----------------------------------------------------------------------------------------------|----------- |
+| [Using kata-deploy](#kata-deploy-installation)       | The preferred way to deploy the Kata Containers distributed binaries on a Kubernetes cluster | **No!**           | Best way to give it a try on kata-containers on an already up and running Kubernetes cluster. | Yes |
+| [Using official distro packages](#official-packages) | Kata packages provided by Linux distributions official repositories                          | yes               | Recommended for most users. | No |
+| [Automatic](#automatic-installation)                 | Run a single command to install a full system                                                | **No!**           | For those wanting the latest release quickly.                                                 | No |
+| [Manual](#manual-installation)                       | Follow a guide step-by-step to install a working system                                      | **No!**           | For those who want the latest release with more control.                                      | No |
+| [Build from source](#build-from-source-installation) | Build the software components manually                                                       | **No!**           | Power users and developers only.  | Yes |
+
+### Kata Deploy Installation
+
+Follow the [`kata-deploy`](../../tools/packaging/kata-deploy/helm-chart/README.md).
+### Official packages
+`ToDo`
+### Automatic Installation
+`ToDo`
+### Manual Installation
+`ToDo`
+
+## Build from source installation
+
+### Rust Environment Set Up
+
+* Download `Rustup` and install  `Rust`
+    > **Notes:**
+    > For Rust version, please set `RUST_VERSION` to the value of `languages.rust.meta.newest-version key` in [`versions.yaml`](../../versions.yaml) or, if `yq` is available on your system, run `export RUST_VERSION=$(yq read versions.yaml languages.rust.meta.newest-version)`.
+
+    Example for `x86_64`
+    ```
+    $ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+    $ source $HOME/.cargo/env
+    $ rustup install ${RUST_VERSION}
+    $ rustup default ${RUST_VERSION}-x86_64-unknown-linux-gnu
+    ```
+
+* Musl support for fully static binary
+
+    Example for `x86_64`
+    ```
+    $ rustup target add x86_64-unknown-linux-musl
+    ```
+* [Musl `libc`](http://musl.libc.org/) install
+
+    Example for musl 1.2.3
+    ```
+    $ curl -O https://git.musl-libc.org/cgit/musl/snapshot/musl-1.2.3.tar.gz
+    $ tar vxf musl-1.2.3.tar.gz
+    $ cd musl-1.2.3/
+    $ ./configure --prefix=/usr/local/
+    $ make && sudo make install
+    ```
+
+
+### Install Kata 3.0 Rust Runtime Shim
+
+```
+$ git clone https://github.com/kata-containers/kata-containers.git
+$ cd kata-containers/src/runtime-rs
+$ make && sudo make install
+```
+After running the command above, the default config file `configuration.toml` will be installed under `/usr/share/defaults/kata-containers/`,  the binary file `containerd-shim-kata-v2` will be installed under `/usr/local/bin/` .
+
+### Install Shim Without Builtin Dragonball VMM
+
+By default, runtime-rs includes the `Dragonball` VMM. To build without the built-in `Dragonball` hypervisor, use `make USE_BUILDIN_DB=false`:
+```bash
+$ cd kata-containers/src/runtime-rs
+$ make USE_BUILDIN_DB=false
+```
+After building, specify the desired hypervisor during installation using `HYPERVISOR`. For example, to use `qemu` or `cloud-hypervisor`:
+
+```
+sudo make install HYPERVISOR=qemu
+```
+or
+```
+sudo make install HYPERVISOR=cloud-hypervisor
+```
+
+### Build Kata Containers Kernel
+Follow the [Kernel installation guide](/tools/packaging/kernel/README.md).
+
+### Build Kata Rootfs
+Follow the [Rootfs installation guide](../../tools/osbuilder/rootfs-builder/README.md).
+
+### Build Kata Image
+Follow the [Image installation guide](../../tools/osbuilder/image-builder/README.md).
+
+### Install Containerd
+
+Follow the [Containerd installation guide](container-manager/containerd/containerd-install.md).
+
+

docs/installation.md

@@ -1,64 +0,0 @@
-# Installation
-
-## Helm Chart
-
-[helm](https://helm.sh/docs/intro/install/) can be used to install templated kubernetes manifests.
-
-### Prerequisites
-
-- **Kubernetes ≥ v1.22** – v1.22 is the first release where the CRI v1 API
-  became the default and `RuntimeClass` left alpha.  The chart depends on those
-  stable interfaces; earlier clusters need `feature‑gates` or CRI shims that are
-  out of scope.
-
-- **Kata Release 3.12** - v3.12.0 introduced publishing the helm-chart on the
-  release page for easier consumption, since v3.8.0 we shipped the helm-chart
-  via source code in the kata-containers `GitHub` repository.
-
-- CRI‑compatible runtime (containerd or CRI‑O). If one wants to use the
-  `multiInstallSuffix` feature one needs at least **containerd-2.0** which
-  supports drop-in config files
-
-- Nodes must allow loading kernel modules and installing Kata artifacts (the
-  chart runs privileged containers to do so)
-
-### `helm install`
-
-```sh
-# Install directly from the official ghcr.io OCI registry
-# update the VERSION X.YY.Z to your needs or just use the latest
-
-export VERSION=$(curl -sSL https://api.github.com/repos/kata-containers/kata-containers/releases/latest | jq .tag_name | tr -d '"')
-export CHART="oci://ghcr.io/kata-containers/kata-deploy-charts/kata-deploy"
-
-$ helm install kata-deploy "${CHART}" --version "${VERSION}"
-
-# See everything you can configure
-$ helm show values "${CHART}" --version "${VERSION}"
-```
-
-This installs the `kata-deploy` DaemonSet and the default Kata `RuntimeClass`
-resources on your cluster.
-
-To see what versions of the chart are available:
-
-```sh
-$ helm show chart oci://ghcr.io/kata-containers/kata-deploy-charts/kata-deploy
-```
-
-### `helm uninstall`
-
-```sh
-$ helm uninstall kata-deploy -n kube-system
-```
-
-During uninstall, Helm will report that some resources were kept due to the
-resource policy (`ServiceAccount`, `ClusterRole`, `ClusterRoleBinding`). This
-is **normal**. A post-delete hook Job runs after uninstall and removes those
-resources so no cluster-wide `RBAC` is left behind.
-
-## Pre-Built Release
-
-Kata can also be installed using the pre-built releases: https://github.com/kata-containers/kata-containers/releases
-
-This method does not have any facilities for artifact lifecycle management.

docs/prerequisites.md

@@ -1,116 +0,0 @@
-# Prerequisites
-
-## Kubernetes
-
-If using Kubernetes, at least version `v1.22` is recommended. This is the first release that the CRI v1 API and the `RuntimeClass` left alpha.
-
-## containerd
-
-Kata requires a [CRI](https://kubernetes.io/docs/concepts/containers/cri/)-compatible container runtime. containerd is commonly used for Kata. We recommend installing containerd using your platform's package distribution mechanism. We recommend at least the latest version of containerd v2.1.x.[^1]
-
-
-### Debian/Ubuntu
-
-To install on Debian-based systems:
-
-```sh
-$ apt update
-$ apt install containerd
-$ systemctl status containerd
-● containerd.service - containerd container runtime
-     Loaded: loaded (/etc/systemd/system/containerd.service; enabled; preset: enabled)
-    Drop-In: /etc/systemd/system/containerd.service.d
-             └─http-proxy.conf
-     Active: active (running) since Wed 2026-02-25 22:58:13 UTC; 5 days ago
-       Docs: https://containerd.io
-   Main PID: 3767885 (containerd)
-      Tasks: 540
-     Memory: 70.7G (peak: 70.8G)
-        CPU: 4h 9min 26.153s
-     CGroup: /runtime.slice/containerd.service
-             ├─  12694 /usr/local/bin/container
-```
-
-### Fedora/RedHat
-
-To install on Fedora-based systems:
-
-```
-$ yum install containerd
-```
-
-??? help
-
-    Documentation assistance is requested for more specific instructions on Fedora systems.
-
-### Pre-Built Releases
-
-Many Linux distributions will not package the latest versions of containerd. If you find that your distribution provides very old versions of containerd, it's recommended to upgrade with the [pre-built releases](https://github.com/containerd/containerd/releases).
-
-#### Executable
-
-Download the latest release of containerd:
-
-```sh
-$ wget https://github.com/containerd/containerd/releases/download/v${VERSION}/containerd-${VERSION}-linux-${PLATFORM}.tar.gz
-
-# Extract to the current directory
-$ tar -xf ./containerd*.tar.gz
-
-# Extract to root if you want it installed to its final location.
-$ tar -C / -xf ./*.tar.gz
-```
-
-### Containerd Config
-
-Containerd requires a config file at `/etc/containerd/config.toml`. This needs to be populated with a simple default config:
-
-```sh
-$ /usr/local/bin/containerd config default > /etc/containerd/config.toml
-```
-
-### Systemd Unit File
-
-Install the systemd unit file:
-
-```sh
-$ wget -O /etc/systemd/system/containerd.service https://raw.githubusercontent.com/containerd/containerd/main/containerd.service
-```
-
-!!! info
-
-    - You must modify the `ExecStart` line to the location of the installed containerd executable.
-    - containerd's `PATH` variable must allow it to find `containerd-shim-kata-v2`. You can do this by either creating a symlink from `/usr/local/bin/containerd-shim-kata-v2` to `/opt/kata/bin/containerd-shim-kata-v2` or by modifying containerd's `PATH` variable to search in `/opt/kata/bin/`. See the Environment= command in systemd.exec(5) for further details.
-
-
-Reload systemd and start containerd:
-
-```sh
-$ systemctl daemon-reload
-$ systemctl enable --now containerd
-$ systemctl start containerd
-$ systemctl status containerd
-```
-
-More details can be found on the [containerd installation docs](https://github.com/containerd/containerd/blob/main/docs/getting-started.md).
-
-### Enable CRI
-
-If you're using Kubernetes, you must enable the containerd Container Runtime Interface (CRI) plugin:
-
-```sh
-$ ctr plugins ls | grep cri
-io.containerd.cri.v1                      images                   -              ok
-io.containerd.cri.v1                      runtime                  linux/amd64    ok
-io.containerd.grpc.v1                     cri                      -              ok
-```
-
-If these are not enabled, you'll need to remove it from the `disabled_plugins` section of the containerd config.
-
-
-[^1]: Kata makes use of containerd's drop-in config merging in `/etc/containerd/config.d/` which is only available starting from containerd v2. containerd v1 may work, but some Kata features will not work as expected.
-
-
-## runc
-
-The default `runc` runtime needs to be installed for non-kata containers. More details can be found at the [containerd docs](https://github.com/containerd/containerd/blob/979c80d8a5d7fc7be34102a1ada53ae5a0ff09e8/docs/RUNC.md).

docs/requirements.txt

@@ -1,9 +0,0 @@
-mkdocs-materialx==10.0.9
-mkdocs-glightbox==0.4.0
-mkdocs-macros-plugin==1.5.0
-mkdocs-awesome-nav==3.3.0
-mkdocs-open-in-new-tab==1.0.8
-mkdocs-redirects==1.2.2
-CairoSVG==2.9.0
-pillow==12.1.1
-click==8.2.1

docs/runtime-configuration.md

@@ -1,56 +0,0 @@
-# Runtime Configuration
-
-The containerd shims (both the Rust and Go implementations) take configuration files to control their behavior. These files are in `/opt/kata/share/defaults/kata-containers/`. An example excerpt:
-
-```toml title="/opt/kata/share/defaults/kata-containers/configuration.toml"
-[hypervisor.qemu]
-path = "/opt/kata/bin/qemu-system-x86_64"
-kernel = "/opt/kata/share/kata-containers/vmlinux.container"
-image = "/opt/kata/share/kata-containers/kata-containers.img"
-machine_type = "q35"
-
-# rootfs filesystem type:
-#   - ext4 (default)
-#   - xfs
-#   - erofs
-rootfs_type = "ext4"
-
-# Enable running QEMU VMM as a non-root user.
-# By default QEMU VMM run as root. When this is set to true, QEMU VMM process runs as
-# a non-root random user. See documentation for the limitations of this mode.
-rootless = false
-
-# List of valid annotation names for the hypervisor
-# Each member of the list is a regular expression, which is the base name
-# of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path"
-enable_annotations = ["enable_iommu", "virtio_fs_extra_args", "kernel_params"]
-```
-
-These files should never be modified directly. If you wish to create a modified version of these files, you may create your own [custom runtime](helm-configuration.md#custom-runtimes). For example, to modify the image path, we provide these values to helm:
-
-```yaml title="values.yaml"
-customRuntimes:
-  enabled: true
-  runtimes:
-    my-gpu-runtime:
-      baseConfig: "qemu-nvidia-gpu"
-      dropIn: |
-        [hypervisor.qemu]
-        image = "/path/to/custom-image.img"
-      runtimeClass: |
-        kind: RuntimeClass
-        apiVersion: node.k8s.io/v1
-        metadata:
-          name: kata-my-gpu-runtime
-          labels:
-            app.kubernetes.io/managed-by: kata-deploy
-        handler: kata-my-gpu-runtime
-        overhead:
-          podFixed:
-            memory: "640Mi"
-            cpu: "500m"
-        scheduling:
-          nodeSelector:
-            katacontainers.io/kata-runtime: "true"
-```
-

docs/threat-model/threat-model.md

@@ -175,7 +175,7 @@ specific).
 
 ##### Dragonball networking
 
-For Dragonball, the `virtio-net` backend default is within Dragonball's VMM.
+For Dragonball, the `virtio-net` backend default is within Dragonbasll's VMM.
 
 
 #### virtio-vsock

docs/use-cases/NVIDIA-GPU-passthrough-and-Kata-QEMU.md

@@ -1,12 +1,11 @@
 # Enabling NVIDIA GPU workloads using GPU passthrough with Kata Containers
 
 This page provides:
-
 1. A description of the components involved when running GPU workloads with
    Kata Containers using the NVIDIA TEE and non-TEE GPU runtime classes.
 1. An explanation of the orchestration flow on a Kubernetes node for this
    scenario.
-1. A deployment guide to utilize these runtime classes.
+1. A deployment guide enabling to utilize these runtime classes.
 
 The goal is to educate readers familiar with Kubernetes and Kata Containers
 on NVIDIA's reference implementation which is reflected in Kata CI's build
@@ -19,56 +18,58 @@ Confidential Containers.
 
 > **Note:**
 >
-> The currently supported modes for enabling GPU workloads in the TEE
-> scenario are: (1) single‑GPU passthrough (one physical GPU per pod) and
-> (2) multi-GPU passthrough on NVSwitch (NVLink) based HGX systems
-> (for example, HGX Hopper (SXM) and HGX Blackwell / HGX B200).
+> The current supported mode for enabling GPU workloads in the TEE scenario
+> is single GPU passthrough (one GPU per pod) on AMD64 platforms (AMD SEV-SNP
+> being the only supported TEE scenario so far with support for Intel TDX being
+> on the way).
 
 ## Component Overview
 
 Before providing deployment guidance, we describe the components involved to
 support running GPU workloads. We start from a top to bottom perspective
-from the NVIDIA GPU Operator via the Kata runtime to the components within
+from the NVIDIA GPU operator via the Kata runtime to the components within
 the NVIDIA GPU Utility Virtual Machine (UVM) root filesystem.
 
 ### NVIDIA GPU Operator
 
 A central component is the
-[NVIDIA GPU Operator](https://github.com/NVIDIA/gpu-operator) which can be
-deployed onto your cluster as a helm chart. Installing the GPU Operator
+[NVIDIA GPU operator](https://github.com/NVIDIA/gpu-operator) which can be
+deployed onto your cluster as a helm chart. Installing the GPU operator
 delivers various operands on your nodes in the form of Kubernetes DaemonSets.
 These operands are vital to support the flow of orchestrating pod manifests
 using NVIDIA GPU runtime classes with GPU passthrough on your nodes. Without
 getting into the details, the most important operands and their
 responsibilities are:
 
-- **nvidia-vfio-manager:** Binding discovered NVIDIA GPUs and nvswitches to
-  the `vfio-pci` driver for VFIO passthrough.
+- **nvidia-vfio-manager:** Binding discovered NVIDIA GPUs to the `vfio-pci`
+  driver for VFIO passthrough.
 - **nvidia-cc-manager:** Transitioning GPUs into confidential computing (CC)
   and non-CC mode (see the
   [NVIDIA/k8s-cc-manager](https://github.com/NVIDIA/k8s-cc-manager)
   repository).
+- **nvidia-kata-manager:** Creating host-side CDI specifications for GPU
+  passthrough, resulting in the file `/var/run/cdi/nvidia.yaml`, containing
+  `kind: nvidia.com/pgpu` (see the
+  [NVIDIA/k8s-kata-manager](https://github.com/NVIDIA/k8s-kata-manager)
+  repository).
 - **nvidia-sandbox-device-plugin** (see the
   [NVIDIA/sandbox-device-plugin](https://github.com/NVIDIA/sandbox-device-plugin)
   repository):
-  - Creating host-side CDI specifications for GPU passthrough,
-    resulting in the file `/var/run/cdi/nvidia.yaml`, containing
-    `kind: nvidia.com/pgpu`
   - Allocating GPUs during pod deployment.
   - Discovering NVIDIA GPUs, their capabilities, and advertising these to
     the Kubernetes control plane (allocatable resources as type
     `nvidia.com/pgpu` resources will appear for the node and GPU Device IDs
     will be registered with Kubelet). These GPUs can thus be allocated as
-    container resources in your pod manifests. See below GPU Operator
+    container resources in your pod manifests. See below GPU operator
     deployment instructions for the use of the key `pgpu`, controlled via a
     variable.
 
-To summarize, the GPU Operator manages the GPUs on each node, allowing for
+To summarize, the GPU operator manages the GPUs on each node, allowing for
 simple orchestration of pod manifests using Kata Containers. Once the cluster
-with GPU Operator and Kata bits is up and running, the end user can schedule
+with GPU operator and Kata bits is up and running, the end user can schedule
 Kata NVIDIA GPU workloads, using resource limits and the
-`kata-qemu-nvidia-gpu`, `kata-qemu-nvidia-gpu-tdx` or
-`kata-qemu-nvidia-gpu-snp` runtime classes, for example:
+`kata-qemu-nvidia-gpu` or `kata-qemu-nvidia-gpu-snp` runtime classes, for
+example:
 
 ```yaml
 apiVersion: v1
@@ -212,7 +213,7 @@ API and kernel drivers, interacting with the pass-through GPU device.
 
 An additional step is exercised in our CI samples: when using images from an
 authenticated registry, the guest-pull mechanism triggers attestation using
-Trustee's Key Broker Service (KBS) for secure release of the NGC API
+trustee's Key Broker Service (KBS) for secure release of the NGC API
 authentication key used to access the NVCR container registry. As part of
 this, the attestation agent exercises composite attestation and transitions
 the GPU into `Ready` state (without this, the GPU has to explicitly be
@@ -231,40 +232,24 @@ NVIDIA GPU CI validation jobs. Note that, this setup:
 - uses the genpolicy tool to attach Kata agent security policies to the pod
   manifest
 - has dedicated (composite) attestation tests, a CUDA vectorAdd test, and a
-  NIM/RA test sample with secure API key release using sealed secrets.
+  NIM/RA test sample with secure API key release
 
 A similar deployment guide and scenario description can be found in NVIDIA resources
 under
-[NVIDIA Confidential Containers Overview (Early Access)](https://docs.nvidia.com/datacenter/cloud-native/confidential-containers/latest/overview.html).
-
-### Feature Set
-
-The NVIDIA stack for Kata Containers leverages features for the confidential
-computing scenario from both the confidential containers open source project
-and from the Kata Containers source tree, such as:
-- composite attestation using Trustee and the NVIDIA Remote Attestation
-Service NRAS
-- generating kata agent security policies using the genpolicy tool
-- use of signed sealed secrets
-- access to authenticated registries for container image guest-pull
-- container image signature verification and encrypted container images
-- ephemeral container data and image layer storage
+[Early Access: NVIDIA GPU Operator with Confidential Containers based on Kata](https://docs.nvidia.com/datacenter/cloud-native/gpu-operator/latest/confidential-containers.html).
 
 ### Requirements
 
 The requirements for the TEE scenario are:
 
 - Ubuntu 25.10 as host OS
-- CPU with AMD SEV-SNP or Intel TDX support with proper BIOS/UEFI version
-and settings
+- CPU with AMD SEV-SNP support with proper BIOS/UEFI version and settings
 - CC-capable Hopper/Blackwell GPU with proper VBIOS version.
 
 BIOS and VBIOS configuration is out of scope for this guide. Other resources,
 such as the documentation found on the
 [NVIDIA Trusted Computing Solutions](https://docs.nvidia.com/nvtrust/index.html)
-page, on the
-[Secure AI Compatibility Matrix](https://www.nvidia.com/en-us/data-center/solutions/confidential-computing/secure-ai-compatibility-matrix/)
-page, and on the above linked NVIDIA documentation, provide guidance on
+page and the above linked NVIDIA documentation, provide guidance on
 selecting proper hardware and on properly configuring its firmware and OS.
 
 ### Installation
@@ -272,16 +257,12 @@ selecting proper hardware and on properly configuring its firmware and OS.
 #### Containerd and Kubernetes
 
 First, set up your Kubernetes cluster. For instance, in Kata CI, our NVIDIA
-jobs use a single-node vanilla Kubernetes cluster with a 2.1 containerd
-version and Kata's current supported Kubernetes version. This cluster is
-being set up using the `deploy_k8s` function from the script file
-`tests/integration/kubernetes/gha-run.sh`. If you intend to run this script,
-follow these steps, and make sure you have `yq` and `helm` installed. Note
-that, these scripts query the GitHub API, so creating and declaring a
-personal access token prevents rate limiting issues.
-You can execute the function as follows:
+jobs use a single-node vanilla Kubernetes cluster with a 2.x containerd
+version and Kata's current supported Kubernetes version. We set this cluster
+up using the `deploy_k8s` function from `tests/integration/kubernetes/gha-run.sh`
+as follows:
+
 ```bash
-$ export GH_TOKEN="<your-gh-pat>"
 $ export KUBERNETES="vanilla"
 $ export CONTAINER_ENGINE="containerd"
 $ export CONTAINER_ENGINE_VERSION="v2.1"
@@ -295,11 +276,8 @@ $ deploy_k8s
 > `runtimeRequestTimeout` timeout value than the two minute default timeout.
 > Using the guest-pull mechanism, pulling large images may take a significant
 > amount of time and may delay container start, possibly leading your Kubelet
-> to de-allocate your pod before it transitions from the *container creating*
-> to the *container running* state. The NVIDIA shim configurations use a
-> `create_container_timeout` of 1200s, which is the equivalent value on shim
-> side, controlling the time the shim allows for a container to remain in
-> *container creating* state.
+> to de-allocate your pod before it transitions from the *container created*
+> to the *container running* state.
 
 > **Note:**
 >
@@ -313,7 +291,7 @@ $ deploy_k8s
 #### GPU Operator
 
 Assuming you have the helm tools installed, deploy the latest version of the
-GPU Operator as a helm chart (minimum version: `v26.3.0`):
+GPU Operator as a helm chart (minimum version: `v25.10.0`):
 
 ```bash
 $ helm repo add nvidia https://helm.ngc.nvidia.com/nvidia && helm repo update
@@ -322,27 +300,33 @@ $ helm install --wait --generate-name \
     nvidia/gpu-operator \
     --set sandboxWorkloads.enabled=true \
     --set sandboxWorkloads.defaultWorkload=vm-passthrough \
-    --set sandboxWorkloads.mode=kata \
+    --set kataManager.enabled=true \
+    --set kataManager.config.runtimeClasses=null \
+    --set kataManager.repository=nvcr.io/nvidia/cloud-native \
+    --set kataManager.image=k8s-kata-manager \
+    --set kataManager.version=v0.2.4 \
+    --set ccManager.enabled=true \
+    --set ccManager.defaultMode=on \
+    --set ccManager.repository=nvcr.io/nvidia/cloud-native \
+    --set ccManager.image=k8s-cc-manager \
+    --set ccManager.version=v0.2.0 \
+    --set sandboxDevicePlugin.repository=nvcr.io/nvidia/cloud-native \
+    --set sandboxDevicePlugin.image=nvidia-sandbox-device-plugin \
+    --set sandboxDevicePlugin.version=v0.0.1 \
+    --set 'sandboxDevicePlugin.env[0].name=P_GPU_ALIAS' \
+    --set 'sandboxDevicePlugin.env[0].value=pgpu' \
     --set nfd.enabled=true \
     --set nfd.nodefeaturerules=true
 ```
 
 > **Note:**
 >
-> For heterogeneous clusters with different GPU types, you can specify an
-> empty `P_GPU_ALIAS` environment variable for the sandbox device plugin:
-> `-    --set 'sandboxDevicePlugin.env[0].name=P_GPU_ALIAS' \`
-> `-    --set 'sandboxDevicePlugin.env[0].value=""' \`
-> This will cause the sandbox device plugin to create GPU model-specific
-> resource types (e.g., `nvidia.com/GH100_H100L_94GB`) instead of the
-> default `pgpu` type, which usually results in advertising a resource of
-> type `nvidia.com/pgpu`
-> The exposed device resource types can be used for pods by specifying
-> respective resource limits.
-> Your node's nvswitches are exposed as resources of type
-> `nvidia.com/nvswitch` by default. Using the variable `NVSWITCH_ALIAS`
-> allows to control the advertising behavior similar to the `P_GPU_ALIAS`
-> variable.
+> For heterogeneous clusters with different GPU types, you can omit
+> the `P_GPU_ALIAS` environment variable lines. This will cause the sandbox
+> device plugin to create GPU model-specific resource types (e.g.,
+> `nvidia.com/GH100_H100L_94GB`) instead of the generic `nvidia.com/pgpu`,
+> which in turn can be used by pods through respective resource limits.
+> For simplicity, this guide uses the generic alias.
 
 > **Note:**
 >
@@ -367,7 +351,8 @@ $ helm install kata-deploy \
     --create-namespace \
     -f "https://raw.githubusercontent.com/kata-containers/kata-containers/refs/tags/${VERSION}/tools/packaging/kata-deploy/helm-chart/kata-deploy/try-kata-nvidia-gpu.values.yaml" \
     --set nfd.enabled=false \
-    --wait --timeout 10m \
+    --set shims.qemu-nvidia-gpu-tdx.enabled=false \
+    --wait --timeout 10m --atomic \
     "${CHART}" --version "${VERSION}"
 ```
 
@@ -397,22 +382,31 @@ mode which requires entering a licensing agreement with NVIDIA, see the
 ### Cluster validation and preparation
 
 If you did not use the `sandboxWorkloads.defaultWorkload=vm-passthrough`
-parameter during GPU Operator deployment, label your nodes for GPU VM
+parameter during GPU operator deployment, label your nodes for GPU VM
 passthrough, for the example of using all nodes for GPU passthrough, run:
 
 ```bash
 $ kubectl label nodes --all nvidia.com/gpu.workload.config=vm-passthrough --overwrite
 ```
 
-With the suggested parameters for GPU Operator deployment, the
-`nvidia-cc-manager` operand will automatically transition the GPU into CC
-mode.
+Check if the `nvidia-cc-manager` pod is running if you intend to run GPU TEE
+scenarios. If not, you need to manually label the node as CC capable. Current
+GPU Operator node feature rules do not yet recognize all CC capable GPU PCI
+IDs. Run the following command:
+
+```bash
+$ kubectl label nodes --all nvidia.com/cc.capable=true
+```
+
+After this, assure the `nvidia-cc-manager` pod is running. With the suggested
+parameters for GPU Operator deployment, the `nvidia-cc-manager` will
+automatically transition the GPU into CC mode.
 
 After deployment, you can transition your node(s) to the desired CC state,
-using either the `on`, `ppcie`, or `off` value, depending on your scenario.
-For the non-CC scenario, transition to the `off` state via:
+using either the `on` or `off` value, depending on your scenario. For the
+non-CC scenario, transition to the `off` state via:
 `kubectl label nodes --all nvidia.com/cc.mode=off` and wait until all pods
-are back running. When an actual change is exercised, various GPU Operator
+are back running. When an actual change is exercised, various GPU operator
 operands will be restarted.
 
 Ensure all pods are running:
@@ -431,10 +425,9 @@ $ lspci -nnk -d 10de:
 
 ### Run the CUDA vectorAdd sample
 
-Create the pod manifest with:
+Create the following file:
 
-```bash
-$ cat > cuda-vectoradd-kata.yaml.in << 'EOF'
+```yaml
 apiVersion: v1
 kind: Pod
 metadata:
@@ -452,7 +445,6 @@ spec:
       limits:
         nvidia.com/pgpu: "1"
         memory: 16Gi
-EOF
 ```
 
 Depending on your scenario and on the CC state, export your desired runtime
@@ -485,17 +477,6 @@ To stop the pod, run: `kubectl delete pod cuda-vectoradd-kata`.
 
 ### Next steps
 
-#### Use multi-GPU passthrough
-
-If you have machines supporting multi-GPU passthrough, use a pod deployment
-manifest which uses 8 pgpu and 4 nvswitch resources.
-On the NVIDIA Hopper architecture multi-GPU passthrough uses protected PCIe
-(PPCIE) which claims exclusive use of the nvswitches for a single CVM. In
-this case, transition your relevant node(s) GPU mode to `ppcie` mode.
-The NVIDIA Blackwell architecture uses NVLink encryption which places the
-switches outside of the Trusted Computing Base (TCB) and so does not
-require a separate switch setting.
-
 #### Transition between CC and non-CC mode
 
 Use the previously described node labeling approach to transition between
@@ -511,7 +492,7 @@ and a basic NIM/RAG deployment. Running CI tests for the TEE GPU scenario
 requires KBS to be deployed (except for the CUDA vectorAdd test). The best
 place to get started running these tests locally is to look into our
 [NVIDIA CI workflow manifest](https://github.com/kata-containers/kata-containers/blob/main/.github/workflows/run-k8s-tests-on-nvidia-gpu.yaml)
-and into the underlying
+and into the underling
 [run_kubernetes_nv_tests.sh](https://github.com/kata-containers/kata-containers/blob/main/tests/integration/kubernetes/run_kubernetes_nv_tests.sh)
 script. For example, to run the CUDA vectorAdd scenario against the TEE GPU
 runtime class use the following commands:
@@ -566,22 +547,6 @@ With GPU passthrough being supported by the
 you can use the tool to create a Kata agent security policy. Our CI deploys
 all sample pod manifests with a Kata agent security policy.
 
-Note that, using containerd 2.1 in upstream's CI, we use the following
-modification to the genpolicy default settings:
-```bash
-[
-  {
-    "op": "replace",
-    "path": "/kata_config/oci_version",
-    "value": "1.2.1"
-  }
-]
-```
-This modification is applied via the genpolicy drop-in configuration file
-`src\tools\genpolicy\drop-in-examples\20-oci-1.2.1-drop-in.json`.
-When using a newer containerd version, such as containerd 2.2, the OCI
-version field needs to be adjusted to "1.3.0", for instance.
-
 #### Deploy pods using your own containers and manifests
 
 You can author pod manifests leveraging your own containers, for instance,
@@ -599,3 +564,6 @@ following annotation in the manifest:
 >
 > - musl-based container images (e.g., using Alpine), or distro-less
 >   containers are not supported.
+> - for the TEE scenario, only single-GPU passthrough per pod is supported,
+>   so your pod resource limit must be: `nvidia.com/pgpu: "1"` (on a system
+>   with multiple GPUs, you can thus pass through one GPU per pod).

mkdocs.yaml

@@ -1,91 +0,0 @@
-site_name: "Kata Containers Docs"
-site_description: "Developer and user documentation for the Kata Containers project."
-site_author: "Kata Containers Community"
-
-repo_url: "https://github.com/kata-containers/kata-containers"
-site_url: "https://kata-containers.github.io/kata-containers"
-edit_uri: "edit/main/docs/"
-repo_name: kata-containers
-
-theme:
-    name: materialx
-    favicon: "assets/images/favicon.svg"
-    logo: "assets/images/favicon.svg"
-    topbar_style: glass
-    palette:
-      - media: "(prefers-color-scheme)"
-        toggle:
-            icon: material/brightness-auto
-            name: Switch to light mode
-      - media: "(prefers-color-scheme: light)"
-        scheme: default
-        primary: blue
-        accent: light blue
-        toggle:
-            icon: material/weather-sunny
-            name: Switch to dark mode
-      - media: "(prefers-color-scheme: dark)"
-        scheme: slate
-        primary: cyan
-        accent: cyan
-        toggle:
-            icon: material/brightness-4
-            name: Switch to system preference
-    features:
-        - content.action.edit
-        - content.action.view
-        - content.code.annotate
-        - content.code.copy
-        - content.code.select
-        - content.footnote.tooltips
-        - content.tabs.link
-        - content.tooltips
-        - navigation.expand
-        - navigation.indexes
-        - navigation.path
-        - navigation.sections
-        - navigation.tabs
-        - navigation.tracking
-        - navigation.top
-        - navigation.instant
-        - navigation.instant.prefetch
-        - navigation.instant.progress
-        - toc.follow
-markdown_extensions:
-    - abbr
-    - admonition
-    - attr_list
-    - def_list
-    - footnotes
-    - md_in_html
-    - pymdownx.arithmatex:
-        generic: true
-    - pymdownx.emoji:
-        emoji_index: !!python/name:material.extensions.emoji.twemoji
-        emoji_generator: !!python/name:material.extensions.emoji.to_svg
-    - pymdownx.details
-    - pymdownx.highlight:
-        anchor_linenums: true
-        line_spans: __span
-        pygments_lang_class: true
-        auto_title: true
-    - pymdownx.keys
-    - pymdownx.magiclink
-    - pymdownx.superfences:
-        custom_fences:
-            - name: mermaid
-              class: mermaid
-              format: !!python/name:pymdownx.superfences.fence_code_format
-    - pymdownx.inlinehilite
-    - pymdownx.tabbed:
-        alternate_style: true
-    - pymdownx.tilde
-    - pymdownx.caret
-    - pymdownx.mark
-    - toc:
-        permalink: true
-
-plugins:
-    - search
-    - awesome-nav
-

osv-scanner.toml

@@ -1,8 +0,0 @@
-[[IgnoredVulns]]
-# yaml-rust is unmaintained.
-# We tried the most promising alternative in https://github.com/kata-containers/kata-containers/pull/12509,
-# but its literal quoting is not conformant.
-id = "RUSTSEC-2024-0320"
-ignoreUntil = 2026-10-01 # TODO(burgerdev): revisit yml library ecosystem
-reason = "No alternative currently supports 'yes' strings correctly; genpolicy processes only trusted input."
-

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
 # Keep in sync with versions.yaml
-channel = "1.92"
+channel = "1.91"

src/agent/Cargo.toml

@@ -1,3 +1,103 @@
+[workspace]
+members = ["rustjail", "policy", "vsock-exporter"]
+
+[workspace.package]
+authors = ["The Kata Containers community <kata-dev@lists.katacontainers.io>"]
+edition = "2018"
+license = "Apache-2.0"
+rust-version = "1.88.0"
+
+[workspace.dependencies]
+oci-spec = { version = "0.8.1", features = ["runtime"] }
+lazy_static = "1.3.0"
+ttrpc = { version = "0.8.4", features = ["async"], default-features = false }
+protobuf = "3.7.2"
+libc = "0.2.94"
+
+# Notes:
+# - Needs to stay in sync with libs
+# - Upgrading to 0.27+ will require code changes (see #11842)
+nix = "0.26.4"
+
+capctl = "0.2.0"
+scan_fmt = "0.2.6"
+scopeguard = "1.0.0"
+thiserror = "1.0.26"
+regex = "1.10.5"
+serial_test = "0.10.0"
+url = "2.5.0"
+derivative = "2.2.0"
+const_format = "0.2.30"
+
+# Async helpers
+async-trait = "0.1.50"
+async-recursion = "0.3.2"
+futures = "0.3.30"
+
+# Async runtime
+tokio = { version = "1.46.1", features = ["full"] }
+tokio-vsock = "0.3.4"
+
+netlink-sys = { version = "0.7.0", features = ["tokio_socket"] }
+rtnetlink = "0.14.0"
+netlink-packet-route = "0.19.0"
+netlink-packet-core = "0.7.0"
+ipnetwork = "0.17.0"
+
+
+slog = "2.5.2"
+slog-scope = "4.1.2"
+slog-term = "2.9.0"
+
+# Redirect ttrpc log calls
+slog-stdlog = "4.0.0"
+log = "0.4.11"
+
+cfg-if = "1.0.0"
+prometheus = { version = "0.14.0", features = ["process"] }
+procfs = "0.12.0"
+
+anyhow = "1"
+
+cgroups = { package = "cgroups-rs", git = "https://github.com/kata-containers/cgroups-rs", rev = "v0.3.5" }
+
+# Tracing
+tracing = "0.1.41"
+tracing-subscriber = "0.2.18"
+tracing-opentelemetry = "0.13.0"
+opentelemetry = { version = "0.14.0", features = ["rt-tokio-current-thread"] }
+
+# Configuration
+serde = { version = "1.0.129", features = ["derive"] }
+serde_json = "1.0.39"
+toml = "0.5.8"
+clap = { version = "4.5.40", features = ["derive"] }
+strum = "0.26.2"
+strum_macros = "0.26.2"
+
+tempfile = "3.19.1"
+which = "4.3.0"
+rstest = "0.18.0"
+async-std = { version = "1.12.0", features = ["attributes"] }
+
+# Local dependencies
+kata-agent-policy = { path = "policy" }
+rustjail = { path = "rustjail" }
+vsock-exporter = { path = "vsock-exporter" }
+
+mem-agent = { path = "../libs/mem-agent" }
+
+kata-sys-util = { path = "../libs/kata-sys-util" }
+kata-types = { path = "../libs/kata-types", features = ["safe-path"] }
+# Note: this crate sets the slog 'max_*' features which allows the log level
+# to be modified at runtime.
+logging = { path = "../libs/logging" }
+protocols = { path = "../libs/protocols" }
+runtime-spec = { path = "../libs/runtime-spec" }
+safe-path = { path = "../libs/safe-path" }
+test-utils = { path = "../libs/test-utils" }
+
+
 [package]
 name = "kata-agent"
 version = "0.1.0"
@@ -57,8 +157,7 @@ cgroups.workspace = true
 # Tracing
 tracing.workspace = true
 tracing-subscriber.workspace = true
-# TODO: bump tracing-opentelemetry to sync with version in workspace
-tracing-opentelemetry = "0.17.0"
+tracing-opentelemetry.workspace = true
 opentelemetry.workspace = true
 
 # Configuration
@@ -96,6 +195,7 @@ pv_core = { git = "https://github.com/ibm-s390-linux/s390-tools", rev = "4942504
 tempfile.workspace = true
 which.workspace = true
 rstest.workspace = true
+async-std.workspace = true
 
 test-utils.workspace = true
 
@@ -107,3 +207,7 @@ seccomp = ["rustjail/seccomp"]
 standard-oci-runtime = ["rustjail/standard-oci-runtime"]
 agent-policy = ["kata-agent-policy"]
 init-data = []
+
+[[bin]]
+name = "kata-agent"
+path = "src/main.rs"

src/agent/Makefile

@@ -63,7 +63,7 @@ ifneq ($(EXTRA_RUSTFEATURES),)
     override EXTRA_RUSTFEATURES := --features "$(EXTRA_RUSTFEATURES)"
 endif
 
-TARGET_PATH = ../../target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET)
+TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET)
 
 ##VAR DESTDIR=<path> is a directory prepended to each installed target file
 DESTDIR ?=
@@ -153,7 +153,7 @@ vendor:
 
 #TARGET test: run cargo tests
 test: $(GENERATED_FILES)
-	@RUST_LIB_BACKTRACE=0 RUST_BACKTRACE=1 cargo test -p kata-agent --target $(TRIPLE) $(EXTRA_RUSTFEATURES) -- --nocapture
+	@RUST_LIB_BACKTRACE=0 RUST_BACKTRACE=1 cargo test --all --target $(TRIPLE) $(EXTRA_RUSTFEATURES) -- --nocapture
 
 ##TARGET check: run test
 check: $(GENERATED_FILES) standard_rust_check

src/agent/policy/Cargo.toml

@@ -18,8 +18,6 @@ serde_json.workspace = true
 # Agent Policy
 regorus = { version = "0.2.8", default-features = false, features = [
     "arc",
-    "base64",
-    "base64url",
     "regex",
     "std",
 ] }

src/agent/src/mount.rs

@@ -89,7 +89,7 @@ pub fn baremount(
     let destination_str = destination.to_string_lossy();
     if let Ok(m) = get_linux_mount_info(destination_str.deref()) {
         if m.fs_type == fs_type && !flags.contains(MsFlags::MS_REMOUNT) {
-            slog::info!(logger, "{source:?} is already mounted at {destination:?}");
+            slog_info!(logger, "{source:?} is already mounted at {destination:?}");
             return Ok(());
         }
     }

src/agent/src/namespace.rs

@@ -110,10 +110,8 @@ impl Namespace {
 
                 unshare(cf)?;
 
-                if ns_type == NamespaceType::Uts {
-                    if let Some(host) = hostname {
-                        nix::unistd::sethostname(host)?;
-                    }
+                if ns_type == NamespaceType::Uts && hostname.is_some() {
+                    nix::unistd::sethostname(hostname.unwrap())?;
                 }
                 // Bind mount the new namespace from the current thread onto the mount point to persist it.
 

src/agent/src/rpc.rs

@@ -2308,6 +2308,9 @@ fn is_sealed_secret_path(source_path: &str) -> bool {
 }
 
 async fn cdh_handler_trusted_storage(oci: &mut Spec) -> Result<()> {
+    if !confidential_data_hub::is_cdh_client_initialized() {
+        return Ok(());
+    }
     let linux = oci
         .linux()
         .as_ref()
@@ -2317,12 +2320,24 @@ async fn cdh_handler_trusted_storage(oci: &mut Spec) -> Result<()> {
         for specdev in devices.iter() {
             if specdev.path().as_path().to_str() == Some(TRUSTED_IMAGE_STORAGE_DEVICE) {
                 let dev_major_minor = format!("{}:{}", specdev.major(), specdev.minor());
-                cdh_secure_mount(
-                    "block-device",
-                    &dev_major_minor,
-                    "luks2",
+                let secure_storage_integrity = AGENT_CONFIG.secure_storage_integrity.to_string();
+                info!(
+                    sl(),
+                    "trusted_store device major:min {}, enable data integrity {}",
+                    dev_major_minor,
+                    secure_storage_integrity
+                );
+
+                let options = std::collections::HashMap::from([
+                    ("deviceId".to_string(), dev_major_minor),
+                    ("encryptType".to_string(), "LUKS".to_string()),
+                    ("dataIntegrity".to_string(), secure_storage_integrity),
+                ]);
+                confidential_data_hub::secure_mount(
+                    "BlockDevice",
+                    &options,
+                    vec![],
                     KATA_IMAGE_WORK_DIR,
-                    "-E lazy_journal_init",
                 )
                 .await?;
                 break;
@@ -2332,51 +2347,6 @@ async fn cdh_handler_trusted_storage(oci: &mut Spec) -> Result<()> {
     Ok(())
 }
 
-pub(crate) async fn cdh_secure_mount(
-    device_type: &str,
-    device_id: &str,
-    encrypt_type: &str,
-    mount_point: &str,
-    mkfs_opts: &str,
-) -> Result<()> {
-    if !confidential_data_hub::is_cdh_client_initialized() {
-        return Ok(());
-    }
-
-    let integrity = AGENT_CONFIG.secure_storage_integrity.to_string();
-
-    info!(
-        sl(),
-        "cdh_secure_mount: device_type {}, device_id {}, encrypt_type {}, integrity {}, mkfs_opts {}",
-        device_type,
-        device_id,
-        encrypt_type,
-        integrity,
-        mkfs_opts
-    );
-
-    let options = std::collections::HashMap::from([
-        ("deviceId".to_string(), device_id.to_string()),
-        ("sourceType".to_string(), "empty".to_string()),
-        ("targetType".to_string(), "fileSystem".to_string()),
-        ("filesystemType".to_string(), "ext4".to_string()),
-        ("mkfsOpts".to_string(), mkfs_opts.to_string()),
-        ("encryptionType".to_string(), encrypt_type.to_string()),
-        ("dataIntegrity".to_string(), integrity),
-    ]);
-
-    std::fs::create_dir_all(mount_point).inspect_err(|e| {
-        error!(
-            sl(),
-            "Failed to create mount point directory {}: {:?}", mount_point, e
-        );
-    })?;
-
-    confidential_data_hub::secure_mount(device_type, &options, vec![], mount_point).await?;
-
-    Ok(())
-}
-
 async fn cdh_handler_sealed_secrets(oci: &mut Spec) -> Result<()> {
     if !confidential_data_hub::is_cdh_client_initialized() {
         return Ok(());

src/agent/src/sandbox.rs

@@ -65,12 +65,6 @@ type UeventWatcher = (Box<dyn UeventMatcher>, oneshot::Sender<Uevent>);
 pub struct StorageState {
     count: Arc<AtomicU32>,
     device: Arc<dyn StorageDevice>,
-
-    /// Whether the storage is shared across multiple containers (e.g.
-    /// block-based emptyDirs). Shared storages should not be cleaned up
-    /// when a container exits; cleanup happens only when the sandbox is
-    /// destroyed.
-    shared: bool,
 }
 
 impl Debug for StorageState {
@@ -80,11 +74,17 @@ impl Debug for StorageState {
 }
 
 impl StorageState {
-    fn new(shared: bool) -> Self {
+    fn new() -> Self {
         StorageState {
             count: Arc::new(AtomicU32::new(1)),
             device: Arc::new(StorageDeviceGeneric::default()),
-            shared,
+        }
+    }
+
+    pub fn from_device(device: Arc<dyn StorageDevice>) -> Self {
+        Self {
+            count: Arc::new(AtomicU32::new(1)),
+            device,
         }
     }
 
@@ -92,10 +92,6 @@ impl StorageState {
         self.device.path()
     }
 
-    pub fn is_shared(&self) -> bool {
-        self.shared
-    }
-
     pub async fn ref_count(&self) -> u32 {
         self.count.load(Ordering::Relaxed)
     }
@@ -175,10 +171,8 @@ impl Sandbox {
 
     /// Add a new storage object or increase reference count of existing one.
     /// The caller may detect new storage object by checking `StorageState.refcount == 1`.
-    /// The `shared` flag indicates if this storage is shared across multiple containers;
-    /// if true, cleanup will be skipped when containers exit.
     #[instrument]
-    pub async fn add_sandbox_storage(&mut self, path: &str, shared: bool) -> StorageState {
+    pub async fn add_sandbox_storage(&mut self, path: &str) -> StorageState {
         match self.storages.entry(path.to_string()) {
             Entry::Occupied(e) => {
                 let state = e.get().clone();
@@ -186,7 +180,7 @@ impl Sandbox {
                 state
             }
             Entry::Vacant(e) => {
-                let state = StorageState::new(shared);
+                let state = StorageState::new();
                 e.insert(state.clone());
                 state
             }
@@ -194,32 +188,22 @@ impl Sandbox {
     }
 
     /// Update the storage device associated with a path.
-    /// Preserves the existing shared flag and reference count.
     pub fn update_sandbox_storage(
         &mut self,
         path: &str,
         device: Arc<dyn StorageDevice>,
     ) -> std::result::Result<Arc<dyn StorageDevice>, Arc<dyn StorageDevice>> {
-        match self.storages.get(path) {
-            None => Err(device),
-            Some(existing) => {
-                let state = StorageState {
-                    device,
-                    ..existing.clone()
-                };
-                // Safe to unwrap() because we have just ensured existence of entry via get().
-                let state = self.storages.insert(path.to_string(), state).unwrap();
-                Ok(state.device)
-            }
+        if !self.storages.contains_key(path) {
+            return Err(device);
         }
+
+        let state = StorageState::from_device(device);
+        // Safe to unwrap() because we have just ensured existence of entry.
+        let state = self.storages.insert(path.to_string(), state).unwrap();
+        Ok(state.device)
     }
 
     /// Decrease reference count and destroy the storage object if reference count reaches zero.
-    ///
-    /// For shared storages (e.g., emptyDir volumes), cleanup is skipped even when refcount
-    /// reaches zero. The storage entry is kept in the map so subsequent containers can reuse
-    /// the already-mounted storage. Actual cleanup happens when the sandbox is destroyed.
-    ///
     /// Returns `Ok(true)` if the reference count has reached zero and the storage object has been
     /// removed.
     #[instrument]
@@ -228,10 +212,6 @@ impl Sandbox {
             None => Err(anyhow!("Sandbox storage with path {} not found", path)),
             Some(state) => {
                 if state.dec_and_test_ref_count().await {
-                    if state.is_shared() {
-                        state.count.store(1, Ordering::Release);
-                        return Ok(false);
-                    }
                     if let Some(storage) = self.storages.remove(path) {
                         storage.device.cleanup()?;
                     }
@@ -740,7 +720,7 @@ mod tests {
         let tmpdir_path = tmpdir.path().to_str().unwrap();
 
         // Add a new sandbox storage
-        let new_storage = s.add_sandbox_storage(tmpdir_path, false).await;
+        let new_storage = s.add_sandbox_storage(tmpdir_path).await;
 
         // Check the reference counter
         let ref_count = new_storage.ref_count().await;
@@ -750,7 +730,7 @@ mod tests {
         );
 
         // Use the existing sandbox storage
-        let new_storage = s.add_sandbox_storage(tmpdir_path, false).await;
+        let new_storage = s.add_sandbox_storage(tmpdir_path).await;
 
         // Since we are using existing storage, the reference counter
         // should be 2 by now.
@@ -791,7 +771,7 @@ mod tests {
 
         assert!(bind_mount(srcdir_path, destdir_path, &logger).is_ok());
 
-        s.add_sandbox_storage(destdir_path, false).await;
+        s.add_sandbox_storage(destdir_path).await;
         let storage = StorageDeviceGeneric::new(destdir_path.to_string());
         assert!(s
             .update_sandbox_storage(destdir_path, Arc::new(storage))
@@ -809,7 +789,7 @@ mod tests {
             let other_dir_path = other_dir.path().to_str().unwrap();
             other_dir_str = other_dir_path.to_string();
 
-            s.add_sandbox_storage(other_dir_path, false).await;
+            s.add_sandbox_storage(other_dir_path).await;
             let storage = StorageDeviceGeneric::new(other_dir_path.to_string());
             assert!(s
                 .update_sandbox_storage(other_dir_path, Arc::new(storage))
@@ -828,9 +808,9 @@ mod tests {
         let storage_path = "/tmp/testEphe";
 
         // Add a new sandbox storage
-        s.add_sandbox_storage(storage_path, false).await;
+        s.add_sandbox_storage(storage_path).await;
         // Use the existing sandbox storage
-        let state = s.add_sandbox_storage(storage_path, false).await;
+        let state = s.add_sandbox_storage(storage_path).await;
         assert!(
             state.ref_count().await > 1,
             "Expects false as the storage is not new."

src/agent/src/storage/block_handler.rs

@@ -6,7 +6,7 @@
 
 use crate::linux_abi::pcipath_from_dev_tree_path;
 use std::fs;
-use std::os::unix::fs::{MetadataExt, PermissionsExt};
+use std::os::unix::fs::PermissionsExt;
 use std::path::Path;
 use std::sync::Arc;
 
@@ -17,7 +17,6 @@ use kata_types::device::{
     DRIVER_BLK_MMIO_TYPE, DRIVER_BLK_PCI_TYPE, DRIVER_NVDIMM_TYPE, DRIVER_SCSI_TYPE,
 };
 use kata_types::mount::StorageDevice;
-use nix::sys::stat::{major, minor};
 use protocols::agent::Storage;
 use tracing::instrument;
 
@@ -30,51 +29,10 @@ use crate::device::block_device_handler::{
 };
 use crate::device::nvdimm_device_handler::wait_for_pmem_device;
 use crate::device::scsi_device_handler::get_scsi_device_name;
-use crate::storage::{
-    common_storage_handler, new_device, set_ownership, StorageContext, StorageHandler,
-};
-use slog::Logger;
+use crate::storage::{common_storage_handler, new_device, StorageContext, StorageHandler};
 #[cfg(target_arch = "s390x")]
 use std::str::FromStr;
 
-fn get_device_number(dev_path: &str, metadata: Option<&fs::Metadata>) -> Result<String> {
-    let dev_id = match metadata {
-        Some(m) => m.rdev(),
-        None => {
-            let m =
-                fs::metadata(dev_path).context(format!("get metadata on file {:?}", dev_path))?;
-            m.rdev()
-        }
-    };
-    Ok(format!("{}:{}", major(dev_id), minor(dev_id)))
-}
-
-async fn handle_block_storage(
-    logger: &Logger,
-    storage: &Storage,
-    dev_num: &str,
-) -> Result<Arc<dyn StorageDevice>> {
-    let has_ephemeral_encryption = storage
-        .driver_options
-        .contains(&"encryption_key=ephemeral".to_string());
-
-    if has_ephemeral_encryption {
-        crate::rpc::cdh_secure_mount(
-            "block-device",
-            dev_num,
-            "luks2",
-            &storage.mount_point,
-            "-O ^has_journal -m 0 -i 163840 -I 128",
-        )
-        .await?;
-        set_ownership(logger, storage)?;
-        new_device(storage.mount_point.clone())
-    } else {
-        let path = common_storage_handler(logger, storage)?;
-        new_device(path)
-    }
-}
-
 #[derive(Debug)]
 pub struct VirtioBlkMmioHandler {}
 
@@ -117,8 +75,6 @@ impl StorageHandler for VirtioBlkPciHandler {
         mut storage: Storage,
         ctx: &mut StorageContext,
     ) -> Result<Arc<dyn StorageDevice>> {
-        let dev_num: String;
-
         // If hot-plugged, get the device node path based on the PCI path
         // otherwise use the virt path provided in Storage Source
         if storage.source.starts_with("/dev") {
@@ -128,16 +84,15 @@ impl StorageHandler for VirtioBlkPciHandler {
             if mode & libc::S_IFBLK == 0 {
                 return Err(anyhow!("Invalid device {}", &storage.source));
             }
-            dev_num = get_device_number(&storage.source, Some(&metadata))?;
         } else {
             let (root_complex, pcipath) = pcipath_from_dev_tree_path(&storage.source)?;
             let dev_path =
                 get_virtio_blk_pci_device_name(ctx.sandbox, root_complex, &pcipath).await?;
             storage.source = dev_path;
-            dev_num = get_device_number(&storage.source, None)?;
         }
 
-        handle_block_storage(ctx.logger, &storage, &dev_num).await
+        let path = common_storage_handler(ctx.logger, &storage)?;
+        new_device(path)
     }
 }
 
@@ -196,10 +151,10 @@ impl StorageHandler for ScsiHandler {
     ) -> Result<Arc<dyn StorageDevice>> {
         // Retrieve the device path from SCSI address.
         let dev_path = get_scsi_device_name(ctx.sandbox, &storage.source).await?;
-        storage.source = dev_path.clone();
+        storage.source = dev_path;
 
-        let dev_num = get_device_number(&dev_path, None)?;
-        handle_block_storage(ctx.logger, &storage, &dev_num).await
+        let path = common_storage_handler(ctx.logger, &storage)?;
+        new_device(path)
     }
 }
 

src/agent/src/storage/mod.rs

@@ -172,11 +172,7 @@ pub async fn add_storages(
 
     for storage in storages {
         let path = storage.mount_point.clone();
-        let state = sandbox
-            .lock()
-            .await
-            .add_sandbox_storage(&path, storage.shared)
-            .await;
+        let state = sandbox.lock().await.add_sandbox_storage(&path).await;
         if state.ref_count().await > 1 {
             if let Some(path) = state.path() {
                 if !path.is_empty() {

src/agent/src/tracer.rs

@@ -5,8 +5,7 @@
 
 use anyhow::Result;
 use opentelemetry::sdk::propagation::TraceContextPropagator;
-use opentelemetry::trace::TracerProvider;
-use opentelemetry::{global, sdk::trace::Config};
+use opentelemetry::{global, sdk::trace::Config, trace::TracerProvider};
 use slog::{info, o, Logger};
 use std::collections::HashMap;
 use tracing_opentelemetry::OpenTelemetryLayer;
@@ -24,12 +23,15 @@ pub fn setup_tracing(name: &'static str, logger: &Logger) -> Result<()> {
     let config = Config::default();
 
     let builder = opentelemetry::sdk::trace::TracerProvider::builder()
-        .with_batch_exporter(exporter, opentelemetry::runtime::Tokio)
+        .with_batch_exporter(exporter, opentelemetry::runtime::TokioCurrentThread)
         .with_config(config);
 
     let provider = builder.build();
 
-    let tracer = provider.tracer(name);
+    // We don't need a versioned tracer.
+    let version = None;
+
+    let tracer = provider.get_tracer(name, version);
 
     let _global_provider = global::set_tracer_provider(provider);
 

src/agent/vsock-exporter/Cargo.toml

@@ -10,7 +10,7 @@ libc.workspace = true
 thiserror.workspace = true
 opentelemetry = { workspace = true, features = ["serialize"] }
 tokio-vsock.workspace = true
-serde_json = "1.0"
+bincode = "1.3.3"
 byteorder = "1.4.3"
 slog = { workspace = true, features = [
     "dynamic-keys",

src/agent/vsock-exporter/src/lib.rs

@@ -58,7 +58,7 @@ pub enum Error {
     #[error("connection error: {0}")]
     ConnectionError(String),
     #[error("serialisation error: {0}")]
-    SerialisationError(#[from] serde_json::Error),
+    SerialisationError(#[from] bincode::Error),
     #[error("I/O error: {0}")]
     IOError(#[from] std::io::Error),
 }
@@ -81,7 +81,8 @@ async fn write_span(
     let mut writer = writer.lock().await;
 
     let encoded_payload: Vec<u8> =
-        serde_json::to_vec(span).map_err(|e| make_io_error(e.to_string()))?;
+        bincode::serialize(&span).map_err(|e| make_io_error(e.to_string()))?;
+
     let payload_len: u64 = encoded_payload.len() as u64;
 
     let mut payload_len_as_bytes: [u8; HEADER_SIZE_BYTES as usize] =

src/dragonball/Cargo.toml

@@ -50,7 +50,6 @@ vm-memory = { workspace = true, features = ["backend-mmap"] }
 crossbeam-channel = "0.5.6"
 vfio-bindings = { workspace = true, optional = true }
 vfio-ioctls = { workspace = true, optional = true }
-kata-sys-util = { path = "../libs/kata-sys-util" }
 
 [dev-dependencies]
 slog-async = "2.7.0"

src/dragonball/dbs_address_space/src/memory/hybrid.rs

@@ -1,15 +1,16 @@
 // Copyright (C) 2022 Alibaba Cloud. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+use std::io::{Read, Write};
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 
 use vm_memory::bitmap::{Bitmap, BS};
-use vm_memory::mmap::NewBitmap;
+use vm_memory::guest_memory::GuestMemoryIterator;
+use vm_memory::mmap::{Error, NewBitmap};
 use vm_memory::{
     guest_memory, AtomicAccess, Bytes, FileOffset, GuestAddress, GuestMemory, GuestMemoryRegion,
-    GuestRegionCollectionError, GuestRegionMmap, GuestUsize, MemoryRegionAddress, ReadVolatile,
-    VolatileSlice, WriteVolatile,
+    GuestRegionMmap, GuestUsize, MemoryRegionAddress, VolatileSlice,
 };
 
 use crate::GuestRegionRaw;
@@ -66,63 +67,63 @@ impl<B: Bitmap> Bytes<MemoryRegionAddress> for GuestRegionHybrid<B> {
         }
     }
 
-    fn read_volatile_from<F>(
+    fn read_from<F>(
         &self,
         addr: MemoryRegionAddress,
         src: &mut F,
         count: usize,
     ) -> guest_memory::Result<usize>
     where
-        F: ReadVolatile,
+        F: Read,
     {
         match self {
-            GuestRegionHybrid::Mmap(region) => region.read_volatile_from(addr, src, count),
-            GuestRegionHybrid::Raw(region) => region.read_volatile_from(addr, src, count),
+            GuestRegionHybrid::Mmap(region) => region.read_from(addr, src, count),
+            GuestRegionHybrid::Raw(region) => region.read_from(addr, src, count),
         }
     }
 
-    fn read_exact_volatile_from<F>(
+    fn read_exact_from<F>(
         &self,
         addr: MemoryRegionAddress,
         src: &mut F,
         count: usize,
     ) -> guest_memory::Result<()>
     where
-        F: ReadVolatile,
+        F: Read,
     {
         match self {
-            GuestRegionHybrid::Mmap(region) => region.read_exact_volatile_from(addr, src, count),
-            GuestRegionHybrid::Raw(region) => region.read_exact_volatile_from(addr, src, count),
+            GuestRegionHybrid::Mmap(region) => region.read_exact_from(addr, src, count),
+            GuestRegionHybrid::Raw(region) => region.read_exact_from(addr, src, count),
         }
     }
 
-    fn write_volatile_to<F>(
+    fn write_to<F>(
         &self,
         addr: MemoryRegionAddress,
         dst: &mut F,
         count: usize,
     ) -> guest_memory::Result<usize>
     where
-        F: WriteVolatile,
+        F: Write,
     {
         match self {
-            GuestRegionHybrid::Mmap(region) => region.write_volatile_to(addr, dst, count),
-            GuestRegionHybrid::Raw(region) => region.write_volatile_to(addr, dst, count),
+            GuestRegionHybrid::Mmap(region) => region.write_to(addr, dst, count),
+            GuestRegionHybrid::Raw(region) => region.write_to(addr, dst, count),
         }
     }
 
-    fn write_all_volatile_to<F>(
+    fn write_all_to<F>(
         &self,
         addr: MemoryRegionAddress,
         dst: &mut F,
         count: usize,
     ) -> guest_memory::Result<()>
     where
-        F: WriteVolatile,
+        F: Write,
     {
         match self {
-            GuestRegionHybrid::Mmap(region) => region.write_all_volatile_to(addr, dst, count),
-            GuestRegionHybrid::Raw(region) => region.write_all_volatile_to(addr, dst, count),
+            GuestRegionHybrid::Mmap(region) => region.write_all_to(addr, dst, count),
+            GuestRegionHybrid::Raw(region) => region.write_all_to(addr, dst, count),
         }
     }
 
@@ -167,7 +168,7 @@ impl<B: Bitmap> GuestMemoryRegion for GuestRegionHybrid<B> {
         }
     }
 
-    fn bitmap(&self) -> BS<'_, Self::B> {
+    fn bitmap(&self) -> &Self::B {
         match self {
             GuestRegionHybrid::Mmap(region) => region.bitmap(),
             GuestRegionHybrid::Raw(region) => region.bitmap(),
@@ -188,6 +189,20 @@ impl<B: Bitmap> GuestMemoryRegion for GuestRegionHybrid<B> {
         }
     }
 
+    unsafe fn as_slice(&self) -> Option<&[u8]> {
+        match self {
+            GuestRegionHybrid::Mmap(region) => region.as_slice(),
+            GuestRegionHybrid::Raw(region) => region.as_slice(),
+        }
+    }
+
+    unsafe fn as_mut_slice(&self) -> Option<&mut [u8]> {
+        match self {
+            GuestRegionHybrid::Mmap(region) => region.as_mut_slice(),
+            GuestRegionHybrid::Raw(region) => region.as_mut_slice(),
+        }
+    }
+
     fn get_slice(
         &self,
         offset: MemoryRegionAddress,
@@ -208,39 +223,6 @@ impl<B: Bitmap> GuestMemoryRegion for GuestRegionHybrid<B> {
     }
 }
 
-impl<B: Bitmap> GuestRegionHybrid<B> {
-    /// Returns a slice corresponding to the region.
-    ///
-    /// # Safety
-    /// This is safe because we mapped the area at addr ourselves, so this slice will not
-    /// overflow. However, it is possible to alias.
-    pub unsafe fn as_slice(&self) -> Option<&[u8]> {
-        match self {
-            GuestRegionHybrid::Mmap(region) => {
-                let addr = region.get_host_address(MemoryRegionAddress(0)).ok()?;
-                Some(std::slice::from_raw_parts(addr, region.len() as usize))
-            }
-            GuestRegionHybrid::Raw(region) => region.as_slice(),
-        }
-    }
-
-    /// Returns a mutable slice corresponding to the region.
-    ///
-    /// # Safety
-    /// This is safe because we mapped the area at addr ourselves, so this slice will not
-    /// overflow. However, it is possible to alias.
-    #[allow(clippy::mut_from_ref)]
-    pub unsafe fn as_mut_slice(&self) -> Option<&mut [u8]> {
-        match self {
-            GuestRegionHybrid::Mmap(region) => {
-                let addr = region.get_host_address(MemoryRegionAddress(0)).ok()?;
-                Some(std::slice::from_raw_parts_mut(addr, region.len() as usize))
-            }
-            GuestRegionHybrid::Raw(region) => region.as_mut_slice(),
-        }
-    }
-}
-
 /// [`GuestMemory`](trait.GuestMemory.html) implementation that manage hybrid types of guest memory
 /// regions.
 ///
@@ -266,9 +248,7 @@ impl<B: Bitmap> GuestMemoryHybrid<B> {
     /// * `regions` - The vector of regions.
     ///   The regions shouldn't overlap and they should be sorted
     ///   by the starting address.
-    pub fn from_regions(
-        mut regions: Vec<GuestRegionHybrid<B>>,
-    ) -> Result<Self, GuestRegionCollectionError> {
+    pub fn from_regions(mut regions: Vec<GuestRegionHybrid<B>>) -> Result<Self, Error> {
         Self::from_arc_regions(regions.drain(..).map(Arc::new).collect())
     }
 
@@ -284,11 +264,9 @@ impl<B: Bitmap> GuestMemoryHybrid<B> {
     /// * `regions` - The vector of `Arc` regions.
     ///   The regions shouldn't overlap and they should be sorted
     ///   by the starting address.
-    pub fn from_arc_regions(
-        regions: Vec<Arc<GuestRegionHybrid<B>>>,
-    ) -> Result<Self, GuestRegionCollectionError> {
+    pub fn from_arc_regions(regions: Vec<Arc<GuestRegionHybrid<B>>>) -> Result<Self, Error> {
         if regions.is_empty() {
-            return Err(GuestRegionCollectionError::NoMemoryRegion);
+            return Err(Error::NoMemoryRegion);
         }
 
         for window in regions.windows(2) {
@@ -296,11 +274,11 @@ impl<B: Bitmap> GuestMemoryHybrid<B> {
             let next = &window[1];
 
             if prev.start_addr() > next.start_addr() {
-                return Err(GuestRegionCollectionError::UnsortedMemoryRegions);
+                return Err(Error::UnsortedMemoryRegions);
             }
 
             if prev.last_addr() >= next.start_addr() {
-                return Err(GuestRegionCollectionError::MemoryRegionOverlap);
+                return Err(Error::MemoryRegionOverlap);
             }
         }
 
@@ -314,7 +292,7 @@ impl<B: Bitmap> GuestMemoryHybrid<B> {
     pub fn insert_region(
         &self,
         region: Arc<GuestRegionHybrid<B>>,
-    ) -> Result<GuestMemoryHybrid<B>, GuestRegionCollectionError> {
+    ) -> Result<GuestMemoryHybrid<B>, Error> {
         let mut regions = self.regions.clone();
         regions.push(region);
         regions.sort_by_key(|x| x.start_addr());
@@ -332,7 +310,7 @@ impl<B: Bitmap> GuestMemoryHybrid<B> {
         &self,
         base: GuestAddress,
         size: GuestUsize,
-    ) -> Result<(GuestMemoryHybrid<B>, Arc<GuestRegionHybrid<B>>), GuestRegionCollectionError> {
+    ) -> Result<(GuestMemoryHybrid<B>, Arc<GuestRegionHybrid<B>>), Error> {
         if let Ok(region_index) = self.regions.binary_search_by_key(&base, |x| x.start_addr()) {
             if self.regions.get(region_index).unwrap().len() as GuestUsize == size {
                 let mut regions = self.regions.clone();
@@ -341,13 +319,32 @@ impl<B: Bitmap> GuestMemoryHybrid<B> {
             }
         }
 
-        Err(GuestRegionCollectionError::NoMemoryRegion)
+        Err(Error::InvalidGuestRegion)
     }
 }
 
+/// An iterator over the elements of `GuestMemoryHybrid`.
+///
+/// This struct is created by `GuestMemory::iter()`. See its documentation for more.
+pub struct Iter<'a, B>(std::slice::Iter<'a, Arc<GuestRegionHybrid<B>>>);
+
+impl<'a, B> Iterator for Iter<'a, B> {
+    type Item = &'a GuestRegionHybrid<B>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.0.next().map(AsRef::as_ref)
+    }
+}
+
+impl<'a, B: 'a> GuestMemoryIterator<'a, GuestRegionHybrid<B>> for GuestMemoryHybrid<B> {
+    type Iter = Iter<'a, B>;
+}
+
 impl<B: Bitmap + 'static> GuestMemory for GuestMemoryHybrid<B> {
     type R = GuestRegionHybrid<B>;
 
+    type I = Self;
+
     fn num_regions(&self) -> usize {
         self.regions.len()
     }
@@ -362,15 +359,15 @@ impl<B: Bitmap + 'static> GuestMemory for GuestMemoryHybrid<B> {
         index.map(|x| self.regions[x].as_ref())
     }
 
-    fn iter(&self) -> impl Iterator<Item = &GuestRegionHybrid<B>> {
-        self.regions.iter().map(AsRef::as_ref)
+    fn iter(&self) -> Iter<'_, B> {
+        Iter(self.regions.iter())
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::io::{Read, Seek, Write};
+    use std::io::Seek;
     use vm_memory::{GuestMemoryError, MmapRegion};
     use vmm_sys_util::tempfile::TempFile;
 
@@ -657,14 +654,14 @@ mod tests {
         // Rewind file pointer after write operation.
         file_to_write_mmap_region.rewind().unwrap();
         guest_region
-            .read_volatile_from(write_addr, &mut file_to_write_mmap_region, size_of_file)
+            .read_from(write_addr, &mut file_to_write_mmap_region, size_of_file)
             .unwrap();
         let mut file_read_from_mmap_region = TempFile::new().unwrap().into_file();
         file_read_from_mmap_region
             .set_len(size_of_file as u64)
             .unwrap();
         guest_region
-            .write_all_volatile_to(write_addr, &mut file_read_from_mmap_region, size_of_file)
+            .write_all_to(write_addr, &mut file_read_from_mmap_region, size_of_file)
             .unwrap();
         // Rewind file pointer after write operation.
         file_read_from_mmap_region.rewind().unwrap();
@@ -682,7 +679,7 @@ mod tests {
         let invalid_addr = MemoryRegionAddress(0x900);
         assert!(matches!(
             guest_region
-                .read_volatile_from(invalid_addr, &mut file_to_write_mmap_region, size_of_file)
+                .read_from(invalid_addr, &mut file_to_write_mmap_region, size_of_file)
                 .err()
                 .unwrap(),
             GuestMemoryError::InvalidBackendAddress
@@ -692,7 +689,7 @@ mod tests {
         let invalid_addr = MemoryRegionAddress(0x900);
         assert!(matches!(
             guest_region
-                .write_volatile_to(invalid_addr, &mut file_read_from_mmap_region, size_of_file)
+                .write_to(invalid_addr, &mut file_read_from_mmap_region, size_of_file)
                 .err()
                 .unwrap(),
             GuestMemoryError::InvalidBackendAddress
@@ -722,14 +719,14 @@ mod tests {
         // Rewind file pointer after write operation.
         file_to_write_mmap_region.rewind().unwrap();
         guest_region
-            .read_volatile_from(write_addr, &mut file_to_write_mmap_region, size_of_file)
+            .read_from(write_addr, &mut file_to_write_mmap_region, size_of_file)
             .unwrap();
         let mut file_read_from_mmap_region = TempFile::new().unwrap().into_file();
         file_read_from_mmap_region
             .set_len(size_of_file as u64)
             .unwrap();
         guest_region
-            .write_all_volatile_to(write_addr, &mut file_read_from_mmap_region, size_of_file)
+            .write_all_to(write_addr, &mut file_read_from_mmap_region, size_of_file)
             .unwrap();
         // Rewind file pointer after write operation.
         file_read_from_mmap_region.rewind().unwrap();
@@ -747,7 +744,7 @@ mod tests {
         let invalid_addr = MemoryRegionAddress(0x900);
         assert!(matches!(
             guest_region
-                .read_volatile_from(invalid_addr, &mut file_to_write_mmap_region, size_of_file)
+                .read_from(invalid_addr, &mut file_to_write_mmap_region, size_of_file)
                 .err()
                 .unwrap(),
             GuestMemoryError::InvalidBackendAddress
@@ -757,7 +754,7 @@ mod tests {
         let invalid_addr = MemoryRegionAddress(0x900);
         assert!(matches!(
             guest_region
-                .write_volatile_to(invalid_addr, &mut file_read_from_mmap_region, size_of_file)
+                .write_to(invalid_addr, &mut file_read_from_mmap_region, size_of_file)
                 .err()
                 .unwrap(),
             GuestMemoryError::InvalidBackendAddress
@@ -791,14 +788,14 @@ mod tests {
             .unwrap();
         file_to_write_mmap_region.rewind().unwrap();
         guest_mmap_region
-            .read_exact_volatile_from(write_addr, &mut file_to_write_mmap_region, size_of_file)
+            .read_exact_from(write_addr, &mut file_to_write_mmap_region, size_of_file)
             .unwrap();
         let mut file_read_from_mmap_region = TempFile::new().unwrap().into_file();
         file_read_from_mmap_region
             .set_len(size_of_file as u64)
             .unwrap();
         guest_mmap_region
-            .write_all_volatile_to(write_addr, &mut file_read_from_mmap_region, size_of_file)
+            .write_all_to(write_addr, &mut file_read_from_mmap_region, size_of_file)
             .unwrap();
         file_read_from_mmap_region.rewind().unwrap();
         let mut content = String::new();
@@ -821,14 +818,14 @@ mod tests {
             .unwrap();
         file_to_write_raw_region.rewind().unwrap();
         guest_raw_region
-            .read_exact_volatile_from(write_addr, &mut file_to_write_raw_region, size_of_file)
+            .read_exact_from(write_addr, &mut file_to_write_raw_region, size_of_file)
             .unwrap();
         let mut file_read_from_raw_region = TempFile::new().unwrap().into_file();
         file_read_from_raw_region
             .set_len(size_of_file as u64)
             .unwrap();
         guest_raw_region
-            .write_all_volatile_to(write_addr, &mut file_read_from_raw_region, size_of_file)
+            .write_all_to(write_addr, &mut file_read_from_raw_region, size_of_file)
             .unwrap();
         file_read_from_raw_region.rewind().unwrap();
         let mut content = String::new();
@@ -845,11 +842,7 @@ mod tests {
         let invalid_addr = MemoryRegionAddress(0x900);
         assert!(matches!(
             guest_mmap_region
-                .read_exact_volatile_from(
-                    invalid_addr,
-                    &mut file_to_write_mmap_region,
-                    size_of_file
-                )
+                .read_exact_from(invalid_addr, &mut file_to_write_mmap_region, size_of_file)
                 .err()
                 .unwrap(),
             GuestMemoryError::InvalidBackendAddress
@@ -859,7 +852,7 @@ mod tests {
         let invalid_addr = MemoryRegionAddress(0x900);
         assert!(matches!(
             guest_mmap_region
-                .write_all_volatile_to(invalid_addr, &mut file_read_from_mmap_region, size_of_file)
+                .write_all_to(invalid_addr, &mut file_read_from_mmap_region, size_of_file)
                 .err()
                 .unwrap(),
             GuestMemoryError::InvalidBackendAddress
@@ -869,7 +862,7 @@ mod tests {
         let invalid_addr = MemoryRegionAddress(0x900);
         assert!(matches!(
             guest_raw_region
-                .read_exact_volatile_from(invalid_addr, &mut file_to_write_raw_region, size_of_file)
+                .read_exact_from(invalid_addr, &mut file_to_write_raw_region, size_of_file)
                 .err()
                 .unwrap(),
             GuestMemoryError::InvalidBackendAddress
@@ -879,7 +872,7 @@ mod tests {
         let invalid_addr = MemoryRegionAddress(0x900);
         assert!(matches!(
             guest_raw_region
-                .write_all_volatile_to(invalid_addr, &mut file_read_from_raw_region, size_of_file)
+                .write_all_to(invalid_addr, &mut file_read_from_raw_region, size_of_file)
                 .err()
                 .unwrap(),
             GuestMemoryError::InvalidBackendAddress
@@ -1083,16 +1076,13 @@ mod tests {
         let guest_region = GuestMemoryHybrid::<()>::from_regions(regions);
         assert!(matches!(
             guest_region.err().unwrap(),
-            GuestRegionCollectionError::UnsortedMemoryRegions
+            Error::UnsortedMemoryRegions
         ));
 
         // Error no memory region case.
         let regions = Vec::<GuestRegionHybrid<()>>::new();
         let guest_region = GuestMemoryHybrid::<()>::from_regions(regions);
-        assert!(matches!(
-            guest_region.err().unwrap(),
-            GuestRegionCollectionError::NoMemoryRegion
-        ));
+        assert!(matches!(guest_region.err().unwrap(), Error::NoMemoryRegion));
     }
 
     #[test]

src/dragonball/dbs_address_space/src/memory/raw_region.rs

@@ -1,6 +1,7 @@
 // Copyright (C) 2022 Alibaba Cloud. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+use std::io::{Read, Write};
 use std::sync::atomic::Ordering;
 
 use vm_memory::bitmap::{Bitmap, BS};
@@ -8,7 +9,7 @@ use vm_memory::mmap::NewBitmap;
 use vm_memory::volatile_memory::compute_offset;
 use vm_memory::{
     guest_memory, volatile_memory, Address, AtomicAccess, Bytes, FileOffset, GuestAddress,
-    GuestMemoryRegion, GuestUsize, MemoryRegionAddress, ReadVolatile, VolatileSlice, WriteVolatile,
+    GuestMemoryRegion, GuestUsize, MemoryRegionAddress, VolatileSlice,
 };
 
 /// Guest memory region for virtio-fs DAX window.
@@ -72,67 +73,67 @@ impl<B: Bitmap> Bytes<MemoryRegionAddress> for GuestRegionRaw<B> {
             .map_err(Into::into)
     }
 
-    fn read_volatile_from<F>(
+    fn read_from<F>(
         &self,
         addr: MemoryRegionAddress,
         src: &mut F,
         count: usize,
     ) -> guest_memory::Result<usize>
     where
-        F: ReadVolatile,
+        F: Read,
     {
         let maddr = addr.raw_value() as usize;
         self.as_volatile_slice()
             .unwrap()
-            .read_volatile_from::<F>(maddr, src, count)
+            .read_from::<F>(maddr, src, count)
             .map_err(Into::into)
     }
 
-    fn read_exact_volatile_from<F>(
+    fn read_exact_from<F>(
         &self,
         addr: MemoryRegionAddress,
         src: &mut F,
         count: usize,
     ) -> guest_memory::Result<()>
     where
-        F: ReadVolatile,
+        F: Read,
     {
         let maddr = addr.raw_value() as usize;
         self.as_volatile_slice()
             .unwrap()
-            .read_exact_volatile_from::<F>(maddr, src, count)
+            .read_exact_from::<F>(maddr, src, count)
             .map_err(Into::into)
     }
 
-    fn write_volatile_to<F>(
+    fn write_to<F>(
         &self,
         addr: MemoryRegionAddress,
         dst: &mut F,
         count: usize,
     ) -> guest_memory::Result<usize>
     where
-        F: WriteVolatile,
+        F: Write,
     {
         let maddr = addr.raw_value() as usize;
         self.as_volatile_slice()
             .unwrap()
-            .write_volatile_to::<F>(maddr, dst, count)
+            .write_to::<F>(maddr, dst, count)
             .map_err(Into::into)
     }
 
-    fn write_all_volatile_to<F>(
+    fn write_all_to<F>(
         &self,
         addr: MemoryRegionAddress,
         dst: &mut F,
         count: usize,
     ) -> guest_memory::Result<()>
     where
-        F: WriteVolatile,
+        F: Write,
     {
         let maddr = addr.raw_value() as usize;
         self.as_volatile_slice()
             .unwrap()
-            .write_all_volatile_to::<F>(maddr, dst, count)
+            .write_all_to::<F>(maddr, dst, count)
             .map_err(Into::into)
     }
 
@@ -169,8 +170,8 @@ impl<B: Bitmap> GuestMemoryRegion for GuestRegionRaw<B> {
         self.guest_base
     }
 
-    fn bitmap(&self) -> BS<'_, Self::B> {
-        self.bitmap.slice_at(0)
+    fn bitmap(&self) -> &Self::B {
+        &self.bitmap
     }
 
     fn get_host_address(&self, addr: MemoryRegionAddress) -> guest_memory::Result<*mut u8> {
@@ -185,6 +186,18 @@ impl<B: Bitmap> GuestMemoryRegion for GuestRegionRaw<B> {
         None
     }
 
+    unsafe fn as_slice(&self) -> Option<&[u8]> {
+        // This is safe because we mapped the area at addr ourselves, so this slice will not
+        // overflow. However, it is possible to alias.
+        Some(std::slice::from_raw_parts(self.addr, self.size))
+    }
+
+    unsafe fn as_mut_slice(&self) -> Option<&mut [u8]> {
+        // This is safe because we mapped the area at addr ourselves, so this slice will not
+        // overflow. However, it is possible to alias.
+        Some(std::slice::from_raw_parts_mut(self.addr, self.size))
+    }
+
     fn get_slice(
         &self,
         offset: MemoryRegionAddress,
@@ -203,7 +216,6 @@ impl<B: Bitmap> GuestMemoryRegion for GuestRegionRaw<B> {
                 (self.addr as usize + offset) as *mut _,
                 count,
                 self.bitmap.slice_at(offset),
-                None,
             )
         })
     }
@@ -214,27 +226,6 @@ impl<B: Bitmap> GuestMemoryRegion for GuestRegionRaw<B> {
     }
 }
 
-impl<B: Bitmap> GuestRegionRaw<B> {
-    /// Returns a slice corresponding to the region.
-    ///
-    /// # Safety
-    /// This is safe because we mapped the area at addr ourselves, so this slice will not
-    /// overflow. However, it is possible to alias.
-    pub unsafe fn as_slice(&self) -> Option<&[u8]> {
-        Some(std::slice::from_raw_parts(self.addr, self.size))
-    }
-
-    /// Returns a mutable slice corresponding to the region.
-    ///
-    /// # Safety
-    /// This is safe because we mapped the area at addr ourselves, so this slice will not
-    /// overflow. However, it is possible to alias.
-    #[allow(clippy::mut_from_ref)]
-    pub unsafe fn as_mut_slice(&self) -> Option<&mut [u8]> {
-        Some(std::slice::from_raw_parts_mut(self.addr, self.size))
-    }
-}
-
 #[cfg(test)]
 mod tests {
     extern crate vmm_sys_util;
@@ -357,7 +348,7 @@ mod tests {
             unsafe { GuestRegionRaw::<()>::new(GuestAddress(0x10_0000), &mut buf as *mut _, 1024) };
 
         let s = m.get_slice(MemoryRegionAddress(2), 3).unwrap();
-        assert_eq!(s.ptr_guard().as_ptr(), &buf[2] as *const _);
+        assert_eq!(s.as_ptr(), &mut buf[2] as *mut _);
     }
 
     /*
@@ -609,7 +600,7 @@ mod tests {
                 File::open(Path::new("c:\\Windows\\system32\\ntoskrnl.exe")).unwrap()
             };
             gm.write_obj(!0u32, addr).unwrap();
-            gm.read_exact_volatile_from(addr, &mut file, mem::size_of::<u32>())
+            gm.read_exact_from(addr, &mut file, mem::size_of::<u32>())
                 .unwrap();
             let value: u32 = gm.read_obj(addr).unwrap();
             if cfg!(unix) {
@@ -619,7 +610,7 @@ mod tests {
             }
 
             let mut sink = Vec::new();
-            gm.write_all_volatile_to(addr, &mut sink, mem::size_of::<u32>())
+            gm.write_all_to(addr, &mut sink, mem::size_of::<u32>())
                 .unwrap();
             if cfg!(unix) {
                 assert_eq!(sink, vec![0; mem::size_of::<u32>()]);

src/dragonball/dbs_arch/src/aarch64/regs.rs

@@ -113,23 +113,20 @@ arm64_sys_reg!(MPIDR_EL1, 3, 0, 0, 0, 5);
 /// * `mem` - Reserved DRAM for current VM.
 pub fn setup_regs(vcpu: &VcpuFd, cpu_id: u8, boot_ip: u64, fdt_address: u64) -> Result<()> {
     // Get the register index of the PSTATE (Processor State) register.
-    vcpu.set_one_reg(
-        arm64_core_reg!(pstate),
-        &(PSTATE_FAULT_BITS_64 as u128).to_le_bytes(),
-    )
-    .map_err(Error::SetCoreRegister)?;
+    vcpu.set_one_reg(arm64_core_reg!(pstate), PSTATE_FAULT_BITS_64 as u128)
+        .map_err(Error::SetCoreRegister)?;
 
     // Other vCPUs are powered off initially awaiting PSCI wakeup.
     if cpu_id == 0 {
         // Setting the PC (Processor Counter) to the current program address (kernel address).
-        vcpu.set_one_reg(arm64_core_reg!(pc), &(boot_ip as u128).to_le_bytes())
+        vcpu.set_one_reg(arm64_core_reg!(pc), boot_ip as u128)
             .map_err(Error::SetCoreRegister)?;
 
         // Last mandatory thing to set -> the address pointing to the FDT (also called DTB).
         // "The device tree blob (dtb) must be placed on an 8-byte boundary and must
         // not exceed 2 megabytes in size." -> https://www.kernel.org/doc/Documentation/arm64/booting.txt.
         // We are choosing to place it the end of DRAM. See `get_fdt_addr`.
-        vcpu.set_one_reg(arm64_core_reg!(regs), &(fdt_address as u128).to_le_bytes())
+        vcpu.set_one_reg(arm64_core_reg!(regs), fdt_address as u128)
             .map_err(Error::SetCoreRegister)?;
     }
     Ok(())
@@ -160,10 +157,9 @@ pub fn is_system_register(regid: u64) -> bool {
 ///
 /// * `vcpu` - Structure for the VCPU that holds the VCPU's fd.
 pub fn read_mpidr(vcpu: &VcpuFd) -> Result<u64> {
-    let mut reg_data = 0u128.to_le_bytes();
-    vcpu.get_one_reg(MPIDR_EL1, &mut reg_data)
-        .map_err(Error::GetSysRegister)?;
-    Ok(u128::from_le_bytes(reg_data) as u64)
+    vcpu.get_one_reg(MPIDR_EL1)
+        .map(|value| value as u64)
+        .map_err(Error::GetSysRegister)
 }
 
 #[cfg(test)]

src/dragonball/dbs_boot/README.md

@@ -10,10 +10,10 @@ This repository contains the following submodules:
 | Name | Arch| Description |
 | --- | --- | --- |
 | [`bootparam`](src/x86_64/bootparam.rs) | x86_64 | Magic addresses externally used to lay out x86_64 VMs |
-| [`fdt`](src/aarch64/fdt.rs) | aarch64| Create FDT for Aarch64 systems |
-| [`layout`](src/x86_64/layout.rs) | x86_64 | x86_64 layout constants |
-| [`layout`](src/aarch64/layout.rs/) | aarch64 | aarch64 layout constants |
-| [`mptable`](src/x86_64/mptable.rs) | x86_64 | MP Table configurations used for defining VM boot status |
+| [fdt](src/aarch64/fdt.rs) | aarch64| Create FDT for Aarch64 systems |
+| [layout](src/x86_64/layout.rs) | x86_64 | x86_64 layout constants |
+| [layout](src/aarch64/layout.rs/) | aarch64 | aarch64 layout constants |
+| [mptable](src/x86_64/mptable.rs) | x86_64 | MP Table configurations used for defining VM boot status |
 
 ## Acknowledgement
 

src/dragonball/dbs_boot/src/x86_64/mptable.rs

@@ -10,6 +10,7 @@
 
 use libc::c_char;
 use std::collections::HashMap;
+use std::io;
 use std::mem;
 use std::result;
 use std::slice;
@@ -204,7 +205,7 @@ pub fn setup_mptable<M: GuestMemory>(
         return Err(Error::AddressOverflow);
     }
 
-    mem.write_slice(&vec![0u8; mp_size], base_mp)
+    mem.read_from(base_mp, &mut io::repeat(0), mp_size)
         .map_err(|_| Error::Clear)?;
 
     {
@@ -451,11 +452,23 @@ mod tests {
         let mpc_offset = GuestAddress(u64::from(mpf_intel.0.physptr));
         let mpc_table: MpcTableWrapper = mem.read_obj(mpc_offset).unwrap();
 
-        let mut buf = Vec::new();
-        mem.write_volatile_to(mpc_offset, &mut buf, mpc_table.0.length as usize)
+        struct Sum(u8);
+        impl io::Write for Sum {
+            fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+                for v in buf.iter() {
+                    self.0 = self.0.wrapping_add(*v);
+                }
+                Ok(buf.len())
+            }
+            fn flush(&mut self) -> io::Result<()> {
+                Ok(())
+            }
+        }
+
+        let mut sum = Sum(0);
+        mem.write_to(mpc_offset, &mut sum, mpc_table.0.length as usize)
             .unwrap();
-        let sum: u8 = buf.iter().fold(0u8, |acc, &v| acc.wrapping_add(v));
-        assert_eq!(sum, 0);
+        assert_eq!(sum.0, 0);
     }
 
     #[test]

src/dragonball/dbs_interrupt/src/kvm/mod.rs

@@ -25,7 +25,7 @@ use std::collections::HashMap;
 use std::io::{Error, ErrorKind};
 use std::sync::{Arc, Mutex};
 
-use kvm_bindings::{kvm_irq_routing_entry, KvmIrqRouting as KvmIrqRoutingWrapper};
+use kvm_bindings::{kvm_irq_routing, kvm_irq_routing_entry};
 use kvm_ioctls::VmFd;
 
 use super::*;
@@ -196,18 +196,26 @@ impl KvmIrqRouting {
     }
 
     fn set_routing(&self, routes: &HashMap<u64, kvm_irq_routing_entry>) -> Result<()> {
-        let mut irq_routing = KvmIrqRoutingWrapper::new(routes.len())
-            .map_err(|_| Error::other("Failed to create KvmIrqRouting"))?;
+        // Allocate enough buffer memory.
+        let elem_sz = std::mem::size_of::<kvm_irq_routing>();
+        let total_sz = std::mem::size_of::<kvm_irq_routing_entry>() * routes.len() + elem_sz;
+        let elem_cnt = total_sz.div_ceil(elem_sz);
+        let mut irq_routings = Vec::<kvm_irq_routing>::with_capacity(elem_cnt);
+        irq_routings.resize_with(elem_cnt, Default::default);
 
-        {
-            let irq_routing_entries = irq_routing.as_mut_slice();
-            for (idx, entry) in routes.values().enumerate() {
-                irq_routing_entries[idx] = *entry;
-            }
+        // Prepare the irq_routing header.
+        let irq_routing = &mut irq_routings[0];
+        irq_routing.nr = routes.len() as u32;
+        irq_routing.flags = 0;
+
+        // Safe because we have just allocated enough memory above.
+        let irq_routing_entries = unsafe { irq_routing.entries.as_mut_slice(routes.len()) };
+        for (idx, entry) in routes.values().enumerate() {
+            irq_routing_entries[idx] = *entry;
         }
 
         self.vm_fd
-            .set_gsi_routing(&irq_routing)
+            .set_gsi_routing(irq_routing)
             .map_err(from_sys_util_errno)?;
 
         Ok(())

src/dragonball/dbs_legacy_devices/src/serial.rs

@@ -242,7 +242,7 @@ mod tests {
 
         let metrics = Arc::new(SerialDeviceMetrics::default());
 
-        let out: Arc<Mutex<Option<Box<dyn std::io::Write + Send + 'static>>>> =
+        let out: Arc<Mutex<Option<Box<(dyn std::io::Write + Send + 'static)>>>> =
             Arc::new(Mutex::new(Some(Box::new(std::io::sink()))));
         let mut serial = SerialDevice {
             serial: Serial::with_events(

src/dragonball/dbs_pci/src/virtio_pci.rs

@@ -1174,6 +1174,7 @@ pub(crate) mod tests {
     use dbs_virtio_devices::Result as VirtIoResult;
     use dbs_virtio_devices::{
         ActivateResult, VirtioDeviceConfig, VirtioDeviceInfo, VirtioSharedMemory,
+        DEVICE_ACKNOWLEDGE, DEVICE_DRIVER, DEVICE_DRIVER_OK, DEVICE_FEATURES_OK, DEVICE_INIT,
     };
 
     use dbs_address_space::{AddressSpaceLayout, AddressSpaceRegion, AddressSpaceRegionType};

src/dragonball/dbs_tdx/README.md

@@ -3,7 +3,7 @@
 This crate is a collection of modules that provides helpers and utilities to create a TDX Dragonball VM.
 
 Currently this crate involves:
-- `tdx-ioctls`
+- tdx-ioctls
 
 ## Acknowledgement
 

src/dragonball/dbs_tdx/src/tdx_ioctls.rs

@@ -11,7 +11,7 @@ use kvm_bindings::{CpuId, __IncompleteArrayField, KVMIO};
 use thiserror::Error;
 use vmm_sys_util::fam::{FamStruct, FamStructWrapper};
 use vmm_sys_util::ioctl::ioctl_with_val;
-use vmm_sys_util::{generate_fam_struct_impl, ioctl_iowr_nr};
+use vmm_sys_util::{generate_fam_struct_impl, ioctl_ioc_nr, ioctl_iowr_nr};
 
 /// Tdx capability list.
 pub type TdxCaps = FamStructWrapper<TdxCapabilities>;

src/dragonball/dbs_utils/src/epoll_manager.rs

@@ -99,61 +99,76 @@ impl Default for EpollManager {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::os::fd::AsRawFd;
-    use std::sync::mpsc::channel;
-    use std::time::Duration;
+    use std::os::unix::io::AsRawFd;
     use vmm_sys_util::{epoll::EventSet, eventfd::EventFd};
 
     struct DummySubscriber {
-        pub event: Arc<EventFd>,
-        pub notify: std::sync::mpsc::Sender<()>,
+        pub event: EventFd,
     }
 
     impl DummySubscriber {
-        fn new(event: Arc<EventFd>, notify: std::sync::mpsc::Sender<()>) -> Self {
-            Self { event, notify }
+        fn new() -> Self {
+            Self {
+                event: EventFd::new(0).unwrap(),
+            }
         }
     }
 
     impl MutEventSubscriber for DummySubscriber {
-        fn init(&mut self, ops: &mut EventOps) {
-            ops.add(Events::new(self.event.as_ref(), EventSet::IN))
-                .unwrap();
-        }
-
         fn process(&mut self, events: Events, _ops: &mut EventOps) {
-            if events.fd() == self.event.as_raw_fd() && events.event_set().contains(EventSet::IN) {
-                let _ = self.event.read();
-                let _ = self.notify.send(());
+            let source = events.fd();
+            let event_set = events.event_set();
+            assert_ne!(source, self.event.as_raw_fd());
+            match event_set {
+                EventSet::IN => {
+                    unreachable!()
+                }
+                EventSet::OUT => {
+                    self.event.read().unwrap();
+                }
+                _ => {
+                    unreachable!()
+                }
             }
         }
+
+        fn init(&mut self, _ops: &mut EventOps) {}
     }
 
     #[test]
     fn test_epoll_manager() {
-        let epoll_manager = EpollManager::default();
-        let (stop_tx, stop_rx) = channel::<()>();
-        let worker_mgr = epoll_manager.clone();
-        let worker = std::thread::spawn(move || {
-            while stop_rx.try_recv().is_err() {
-                let _ = worker_mgr.handle_events(50);
+        let mut epoll_manager = EpollManager::default();
+        let epoll_manager_clone = epoll_manager.clone();
+        let thread = std::thread::spawn(move || loop {
+            let count = epoll_manager_clone.handle_events(-1).unwrap();
+            if count == 0 {
+                continue;
             }
+            assert_eq!(count, 1);
+            break;
         });
-
-        let (notify_tx, notify_rx) = channel::<()>();
-
-        let event = Arc::new(EventFd::new(0).unwrap());
-        let handler = DummySubscriber::new(event.clone(), notify_tx);
+        let handler = DummySubscriber::new();
+        let event = handler.event.try_clone().unwrap();
         let id = epoll_manager.add_subscriber(Box::new(handler));
 
+        thread.join().unwrap();
+
+        epoll_manager
+            .add_event(id, Events::new(&event, EventSet::OUT))
+            .unwrap();
         event.write(1).unwrap();
 
-        notify_rx
-            .recv_timeout(Duration::from_secs(2))
-            .expect("timeout waiting for subscriber to be processed");
+        let epoll_manager_clone = epoll_manager.clone();
+        let thread = std::thread::spawn(move || loop {
+            let count = epoll_manager_clone.handle_events(-1).unwrap();
+            if count == 0 {
+                continue;
+            }
+            assert_eq!(count, 2);
+            break;
+        });
 
-        epoll_manager.clone().remove_subscriber(id).unwrap();
-        let _ = stop_tx.send(());
-        worker.join().unwrap();
+        thread.join().unwrap();
+        epoll_manager.remove_subscriber(id).unwrap();
     }
 }

src/dragonball/dbs_utils/src/net/tap.rs

@@ -13,7 +13,7 @@ use std::os::raw::*;
 use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
 
 use vmm_sys_util::ioctl::{ioctl_with_mut_ref, ioctl_with_ref, ioctl_with_val};
-use vmm_sys_util::ioctl_iow_nr;
+use vmm_sys_util::{ioctl_ioc_nr, ioctl_iow_nr};
 
 use crate::net::net_gen;
 

src/dragonball/dbs_virtio_devices/Cargo.toml

@@ -23,15 +23,15 @@ dbs-address-space = { workspace = true }
 dbs-boot = { workspace = true }
 epoll = ">=4.3.1, <4.3.2"
 io-uring = "0.5.2"
-fuse-backend-rs = { version = "0.14.0", optional = true }
+fuse-backend-rs = { version = "0.10.5", optional = true }
 kvm-bindings = { workspace = true }
 kvm-ioctls = { workspace = true }
 libc = "0.2.119"
 log = "0.4.14"
 nix = "0.24.3"
-nydus-api = "0.4.1"
-nydus-rafs = "0.4.1"
-nydus-storage = "0.7.2"
+nydus-api = "0.3.1"
+nydus-rafs = "0.3.2"
+nydus-storage = "0.6.4"
 rlimit = "0.7.0"
 serde = "1.0.27"
 serde_json = "1.0.9"
@@ -42,9 +42,8 @@ virtio-queue = { workspace = true }
 vmm-sys-util = { workspace = true }
 vm-memory = { workspace = true, features = ["backend-mmap"] }
 sendfd = "0.4.3"
-vhost-rs = { version = "0.15.0", package = "vhost", optional = true }
+vhost-rs = { version = "0.6.1", package = "vhost", optional = true }
 timerfd = "1.0"
-kata-sys-util = { workspace = true}
 
 [dev-dependencies]
 vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }
@@ -64,7 +63,7 @@ virtio-fs-pro = [
 ]
 virtio-mem = ["virtio-mmio"]
 virtio-balloon = ["virtio-mmio"]
-vhost = ["virtio-mmio", "vhost-rs/vhost-user-frontend", "vhost-rs/vhost-kern"]
+vhost = ["virtio-mmio", "vhost-rs/vhost-user-master", "vhost-rs/vhost-kern"]
 vhost-net = ["vhost", "vhost-rs/vhost-net"]
 vhost-user = ["vhost"]
 vhost-user-fs = ["vhost-user"]

src/dragonball/dbs_virtio_devices/src/balloon.rs

@@ -34,7 +34,7 @@ use dbs_utils::epoll_manager::{
 use dbs_utils::metric::{IncMetric, SharedIncMetric, SharedStoreMetric, StoreMetric};
 use log::{debug, error, info, trace};
 use serde::Serialize;
-use virtio_bindings::bindings::virtio_config::VIRTIO_F_VERSION_1;
+use virtio_bindings::bindings::virtio_blk::VIRTIO_F_VERSION_1;
 use virtio_queue::{QueueOwnedT, QueueSync, QueueT};
 use vm_memory::{
     ByteValued, Bytes, GuestAddress, GuestAddressSpace, GuestMemory, GuestMemoryRegion,

src/dragonball/dbs_virtio_devices/src/block/device.rs

@@ -20,7 +20,6 @@ use dbs_utils::{
 };
 use log::{debug, error, info, warn};
 use virtio_bindings::bindings::virtio_blk::*;
-use virtio_bindings::bindings::virtio_config::VIRTIO_F_VERSION_1;
 use virtio_queue::QueueT;
 use vm_memory::GuestMemoryRegion;
 use vmm_sys_util::eventfd::{EventFd, EFD_NONBLOCK};

src/dragonball/dbs_virtio_devices/src/block/request.rs

@@ -2,13 +2,13 @@
 // Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use std::io::{self, Read, Seek, SeekFrom, Write};
+use std::io::{self, Seek, SeekFrom, Write};
 use std::ops::Deref;
 use std::result;
 
 use log::error;
 use virtio_bindings::bindings::virtio_blk::*;
-use virtio_queue::{desc::split::Descriptor, DescriptorChain};
+use virtio_queue::{Descriptor, DescriptorChain};
 use vm_memory::{ByteValued, Bytes, GuestAddress, GuestMemory, GuestMemoryError};
 
 use crate::{
@@ -231,19 +231,13 @@ impl Request {
         for io in data_descs {
             match self.request_type {
                 RequestType::In => {
-                    let mut buf = vec![0u8; io.data_len];
-                    disk.read_exact(&mut buf)
-                        .map_err(|e| ExecuteError::Read(GuestMemoryError::IOError(e)))?;
-                    mem.write_slice(&buf, GuestAddress(io.data_addr))
+                    mem.read_from(GuestAddress(io.data_addr), disk, io.data_len)
                         .map_err(ExecuteError::Read)?;
                     len += io.data_len;
                 }
                 RequestType::Out => {
-                    let mut buf = vec![0u8; io.data_len];
-                    mem.read_slice(&mut buf, GuestAddress(io.data_addr))
+                    mem.write_to(GuestAddress(io.data_addr), disk, io.data_len)
                         .map_err(ExecuteError::Write)?;
-                    disk.write_all(&buf)
-                        .map_err(|e| ExecuteError::Write(GuestMemoryError::IOError(e)))?;
                 }
                 RequestType::Flush => match disk.flush() {
                     Ok(_) => {}

src/dragonball/dbs_virtio_devices/src/fs/device.rs

@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
 
-use kata_sys_util::netns::NetnsGuard;
 use std::any::Any;
 use std::collections::HashMap;
 use std::ffi::CString;
@@ -30,7 +29,7 @@ use nydus_api::ConfigV2;
 use nydus_rafs::blobfs::{BlobFs, Config as BlobfsConfig};
 use nydus_rafs::{fs::Rafs, RafsIoRead};
 use rlimit::Resource;
-use virtio_bindings::bindings::virtio_config::VIRTIO_F_VERSION_1;
+use virtio_bindings::bindings::virtio_blk::VIRTIO_F_VERSION_1;
 use virtio_queue::QueueT;
 use vm_memory::{
     FileOffset, GuestAddress, GuestAddressSpace, GuestRegionMmap, GuestUsize, MmapRegion,
@@ -234,7 +233,6 @@ impl<AS: GuestAddressSpace> VirtioFs<AS> {
             CachePolicy::Always => Duration::from_secs(CACHE_ALWAYS_TIMEOUT),
             CachePolicy::Never => Duration::from_secs(CACHE_NONE_TIMEOUT),
             CachePolicy::Auto => Duration::from_secs(CACHE_AUTO_TIMEOUT),
-            CachePolicy::Metadata => Duration::from_secs(CACHE_AUTO_TIMEOUT),
         }
     }
 
@@ -455,11 +453,6 @@ impl<AS: GuestAddressSpace> VirtioFs<AS> {
         prefetch_list_path: Option<String>,
     ) -> FsResult<()> {
         debug!("http_server rafs");
-        // We need to make sure the nydus worker thread in the runD main process's network namespace
-        // instead of the vmm thread's netns, which wouldn't access the host network.
-        let _netns_guard =
-            NetnsGuard::new("/proc/self/ns/net").map_err(|e| FsError::BackendFs(e.to_string()))?;
-
         let file = Path::new(&source);
         let (mut rafs, rafs_cfg) = match config.as_ref() {
             Some(cfg) => {
@@ -548,7 +541,7 @@ impl<AS: GuestAddressSpace> VirtioFs<AS> {
                 )));
             }
         };
-        let any_fs = rootfs.0.deref().as_any();
+        let any_fs = rootfs.deref().as_any();
         if let Some(fs_swap) = any_fs.downcast_ref::<Rafs>() {
             let mut file = <dyn RafsIoRead>::from_file(&source)
                 .map_err(|e| FsError::BackendFs(format!("RafsIoRead failed: {e:?}")))?;
@@ -618,7 +611,8 @@ impl<AS: GuestAddressSpace> VirtioFs<AS> {
         };
 
         let region = Arc::new(
-            GuestRegionMmap::new(mmap_region, GuestAddress(guest_addr)).ok_or(Error::InsertMmap)?,
+            GuestRegionMmap::new(mmap_region, GuestAddress(guest_addr))
+                .map_err(Error::InsertMmap)?,
         );
         self.handler.insert_region(region.clone())?;
 

src/dragonball/dbs_virtio_devices/src/lib.rs

@@ -245,8 +245,8 @@ pub enum Error {
     #[error("set user memory region failed: {0}")]
     SetUserMemoryRegion(kvm_ioctls::Error),
     /// Inserting mmap region failed.
-    #[error("inserting mmap region failed")]
-    InsertMmap,
+    #[error("inserting mmap region failed: {0}")]
+    InsertMmap(vm_memory::mmap::Error),
     /// Failed to set madvise on guest memory region.
     #[error("failed to set madvice() on guest memory region")]
     Madvise(#[source] nix::Error),

src/dragonball/dbs_virtio_devices/src/mem.rs

@@ -30,7 +30,7 @@ use dbs_utils::epoll_manager::{
 };
 use kvm_ioctls::VmFd;
 use log::{debug, error, info, trace, warn};
-use virtio_bindings::bindings::virtio_config::VIRTIO_F_VERSION_1;
+use virtio_bindings::bindings::virtio_blk::VIRTIO_F_VERSION_1;
 use virtio_queue::{DescriptorChain, QueueOwnedT, QueueSync, QueueT};
 use vm_memory::{
     ByteValued, Bytes, GuestAddress, GuestAddressSpace, GuestMemory, GuestMemoryError,
@@ -1389,7 +1389,7 @@ pub(crate) mod tests {
             .map_err(Error::NewMmapRegion)?;
 
             let region =
-                Arc::new(GuestRegionMmap::new(mmap_region, guest_addr).ok_or(Error::InsertMmap)?);
+                Arc::new(GuestRegionMmap::new(mmap_region, guest_addr).map_err(Error::InsertMmap)?);
 
             Ok(region)
         }

src/dragonball/dbs_virtio_devices/src/net.rs

@@ -22,7 +22,6 @@ use dbs_utils::net::{net_gen, MacAddr, Tap};
 use dbs_utils::rate_limiter::{BucketUpdate, RateLimiter, TokenType};
 use libc;
 use log::{debug, error, info, trace, warn};
-use virtio_bindings::bindings::virtio_config::VIRTIO_F_VERSION_1;
 use virtio_bindings::bindings::virtio_net::*;
 use virtio_queue::{QueueOwnedT, QueueSync, QueueT};
 use vm_memory::{Bytes, GuestAddress, GuestAddressSpace, GuestMemoryRegion, GuestRegionMmap};