handle filesystem virtiofs devices

Signed-off-by: Vladik Romanovsky <[email protected]>
iHalt10 · Sep 18, 2020 · 835249b · 835249b
1 parent 34a6a33
commit 835249b
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 16 deletions.
diff --git a/pkg/virt-controller/services/template.go b/pkg/virt-controller/services/template.go
@@ -1103,7 +1103,7 @@ func getRequiredCapabilities(vmi *v1.VirtualMachineInstance) []k8sv1.Capability
 	res = append(res, CAP_SYS_NICE)
 
 	// add CAP_SYS_ADMIN capability to allow virtiofs
-	if utils.IsVMIVirtiofsEnabled(vmi) {
+	if util.IsVMIVirtiofsEnabled(vmi) {
 		res = append(res, CAP_SYS_ADMIN)
 	}
 	return res

diff --git a/pkg/virt-launcher/virtwrap/api/converter.go b/pkg/virt-launcher/virtwrap/api/converter.go
@@ -15,7 +15,7 @@
  *
  * Copyright 2017, 2018 Red Hat, Inc.
  *
- */
+*/
 
 package api
 
@@ -822,25 +822,25 @@ func Convert_v1_VirtualMachine_To_api_Domain(vmi *v1.VirtualMachineInstance, dom
 		return err
 	}
 
-    var isMemfdRequired = false
+	var isMemfdRequired = false
 	if vmi.Spec.Domain.Memory != nil && vmi.Spec.Domain.Memory.Hugepages != nil {
 		domain.Spec.MemoryBacking = &MemoryBacking{
 			HugePages: &HugePages{},
 		}
 		if val := vmi.Annotations[v1.MemfdMemoryBackend]; val != "false" {
-            isMemfdRequired = true
-        }
-    }
-    // virtiofs require shared access
-    if utils.IsVMIVirtiofsEnabled {
-        if domain.Spec.MemoryBacking == nil {
-            domain.Spec.MemoryBacking = &MemoryBacking{}
-        }
-        domain.Spec.MemoryBacking.Access = &MemoryBackingAccess{
-            Mode: "shared",
-        }
-        isMemfdRequired = true
-    }
+			isMemfdRequired = true
+		}
+	}
+	// virtiofs require shared access
+	if util.IsVMIVirtiofsEnabled(vmi) {
+		if domain.Spec.MemoryBacking == nil {
+			domain.Spec.MemoryBacking = &MemoryBacking{}
+		}
+		domain.Spec.MemoryBacking.Access = &MemoryBackingAccess{
+			Mode: "shared",
+		}
+		isMemfdRequired = true
+	}
 
 	if isMemfdRequired {
 		// Set memfd as memory backend to solve SELinux restrictions
@@ -977,6 +977,40 @@ func Convert_v1_VirtualMachine_To_api_Domain(vmi *v1.VirtualMachineInstance, dom
 
 		domain.Spec.Devices.Disks = append(domain.Spec.Devices.Disks, newDisk)
 	}
+	// Handle virtioFS
+	for _, fs := range vmi.Spec.Domain.Devices.Filesystems {
+		newFS := FilesystemDevice{}
+
+		newFS.Type = "mount"
+		newFS.AccessMode = "passthrough"
+		newFS.Driver = &FilesystemDriver{
+			Type:  "virtiofs",
+			Queue: "1024",
+		}
+		newFS.Binary = &FilesystemBinary{
+			Path:  "/usr/libexec/virtiofsd",
+			Xattr: "on",
+			Cache: &FilesystemBinaryCache{
+				Mode: "always",
+			},
+			Lock: &FilesystemBinaryLock{
+				Posix: "on",
+				Flock: "on",
+			},
+		}
+		newFS.Target = &FilesystemTarget{
+			Dir: fs.Name,
+		}
+
+		volume := volumes[fs.Name]
+		if volume == nil {
+			return fmt.Errorf("No matching volume with name %s found", fs.Name)
+		}
+		volDir, _ := filepath.Split(GetFilesystemVolumePath(volume.Name))
+		newFS.Source = &FilesystemSource{}
+		newFS.Source.Dir = volDir
+		domain.Spec.Devices.Filesystems = append(domain.Spec.Devices.Filesystems, newFS)
+	}
 
 	if vmi.Spec.Domain.Devices.Watchdog != nil {
 		newWatchdog := &Watchdog{}

diff --git a/staging/src/kubevirt.io/client-go/api/v1/schema.go b/staging/src/kubevirt.io/client-go/api/v1/schema.go
@@ -372,6 +372,9 @@ type Devices struct {
 	//Whether to attach a GPU device to the vmi.
 	// +optional
 	GPUs []GPU `json:"gpus,omitempty"`
+	// Filesystem describes virtiofs filesystem which is connected to the vmi.
+	// +optional
+	Filesystems []Filesystem `json:"filesystem,omitempty"`
 }
 
 //
@@ -387,6 +390,13 @@ type Input struct {
 	Name string `json:"name"`
 }
 
+//
+// +k8s:openapi-gen=true
+type Filesystem struct {
+	// Name is the device name
+	Name string `json:"name"`
+}
+
 //
 // +k8s:openapi-gen=true
 type GPU struct {