refactor: add returned error to NvmeTransport

Signed-off-by: Artsiom Koltun <[email protected]>
glimchb · Sep 25, 2023 · 0a1f926 · 0a1f926
1 parent ffc9fca
commit 0a1f926
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/pkg/frontend/frontend.go b/pkg/frontend/frontend.go
@@ -15,7 +15,7 @@ import (
 // NvmeTransport interface is used to provide SPDK call params to create/delete
 // Nvme controllers depending on used transport type.
 type NvmeTransport interface {
-	Params(ctrlr *pb.NvmeController, nqn string) spdk.NvmfSubsystemAddListenerParams
+	Params(ctrlr *pb.NvmeController, nqn string) (spdk.NvmfSubsystemAddListenerParams, error)
 }
 
 // NvmeParameters contains all Nvme related structures

diff --git a/pkg/frontend/nvme_controller.go b/pkg/frontend/nvme_controller.go
@@ -75,7 +75,7 @@ func NewNvmeTCPTransport(listenAddr string) NvmeTransport {
 	}
 }
 
-func (c *nvmeTCPTransport) Params(_ *pb.NvmeController, nqn string) spdk.NvmfSubsystemAddListenerParams {
+func (c *nvmeTCPTransport) Params(_ *pb.NvmeController, nqn string) (spdk.NvmfSubsystemAddListenerParams, error) {
 	result := spdk.NvmfSubsystemAddListenerParams{}
 	result.Nqn = nqn
 	result.SecureChannel = false
@@ -84,7 +84,7 @@ func (c *nvmeTCPTransport) Params(_ *pb.NvmeController, nqn string) spdk.NvmfSub
 	result.ListenAddress.Trsvcid = c.listenPort
 	result.ListenAddress.Adrfam = c.protocol
 
-	return result
+	return result, nil
 }
 
 // CreateNvmeController creates an Nvme controller
@@ -116,9 +116,14 @@ func (s *Server) CreateNvmeController(_ context.Context, in *pb.CreateNvmeContro
 		return nil, err
 	}
 
-	params := s.Nvme.transport.Params(in.NvmeController, subsys.Spec.Nqn)
+	params, err := s.Nvme.transport.Params(in.NvmeController, subsys.Spec.Nqn)
+	if err != nil {
+		log.Printf("error: failed to create params for spdk call: %v", err)
+		return nil, status.Error(codes.InvalidArgument, err.Error())
+	}
+
 	var result spdk.NvmfSubsystemAddListenerResult
-	err := s.rpc.Call("nvmf_subsystem_add_listener", &params, &result)
+	err = s.rpc.Call("nvmf_subsystem_add_listener", &params, &result)
 	if err != nil {
 		log.Printf("error: %v", err)
 		return nil, err
@@ -163,9 +168,14 @@ func (s *Server) DeleteNvmeController(_ context.Context, in *pb.DeleteNvmeContro
 		return nil, err
 	}
 
-	params := s.Nvme.transport.Params(controller, subsys.Spec.Nqn)
+	params, err := s.Nvme.transport.Params(controller, subsys.Spec.Nqn)
+	if err != nil {
+		log.Printf("error: failed to create params for spdk call: %v", err)
+		return nil, status.Error(codes.InvalidArgument, err.Error())
+	}
+
 	var result spdk.NvmfSubsystemAddListenerResult
-	err := s.rpc.Call("nvmf_subsystem_remove_listener", &params, &result)
+	err = s.rpc.Call("nvmf_subsystem_remove_listener", &params, &result)
 	if err != nil {
 		log.Printf("error: %v", err)
 		return nil, err

diff --git a/pkg/kvm/nvme.go b/pkg/kvm/nvme.go
@@ -6,6 +6,7 @@ package kvm
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -41,14 +42,25 @@ func NewNvmeVfiouserTransport(ctrlrDir string) frontend.NvmeTransport {
 	}
 }
 
-func (c *nvmeVfiouserTransport) Params(ctrlr *pb.NvmeController, nqn string) spdk.NvmfSubsystemAddListenerParams {
+func (c *nvmeVfiouserTransport) Params(ctrlr *pb.NvmeController, nqn string) (spdk.NvmfSubsystemAddListenerParams, error) {
+	pcieID := ctrlr.Spec.PcieId
+	if pcieID.PortId.Value != 0 {
+		return spdk.NvmfSubsystemAddListenerParams{},
+			errors.New("only port 0 is supported for vfiouser")
+	}
+
+	if pcieID.VirtualFunction.Value != 0 {
+		return spdk.NvmfSubsystemAddListenerParams{},
+			errors.New("virtual functions are not supported for vfiouser")
+	}
+
 	result := spdk.NvmfSubsystemAddListenerParams{}
 	ctrlrDirPath := controllerDirPath(c.ctrlrDir, frontend.GetSubsystemIDFromNvmeName(ctrlr.Name))
 	result.Nqn = nqn
 	result.ListenAddress.Trtype = "vfiouser"
 	result.ListenAddress.Traddr = ctrlrDirPath
 
-	return result
+	return result, nil
 }
 
 // CreateNvmeController creates an Nvme controller device and attaches it to QEMU instance