Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use opi-spdk bridge to create nvme controller #43

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func main() {
s := grpc.NewServer()

jsonRPC := server.NewSpdkJSONRPC(spdkSocket)
frontendOpiIntelServer := fe.NewServer(jsonRPC)
frontendOpiIntelServer := frontend.NewServerWithSubsystemListener(jsonRPC, fe.NewSubsystemListener())
frontendOpiSpdkServer := frontend.NewServer(jsonRPC)
backendOpiSpdkServer := backend.NewServer(jsonRPC)
middleendOpiSpdkServer := middleend.NewServer(jsonRPC)
Expand Down
142 changes: 11 additions & 131 deletions pkg/frontend/nvme.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,147 +5,27 @@
package frontend

import (
"context"
"fmt"
"log"
"strconv"

pb "github.com/opiproject/opi-api/storage/v1alpha1/gen/go"
"github.com/opiproject/opi-spdk-bridge/pkg/frontend"
"github.com/opiproject/opi-spdk-bridge/pkg/models"
"github.com/ulule/deepcopier"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/emptypb"
)

const (
mevTransportType = "npi"
)

// CreateNVMeController creates an NVMe Controller
func (s *Server) CreateNVMeController(ctx context.Context, in *pb.CreateNVMeControllerRequest) (*pb.NVMeController, error) {
log.Printf("CreateNVMeController: Received from client: %v", in)

err := verifyCreateNvmeControllerRequestArgs(in)
if err != nil {
return nil, err
}

subsys, ok := s.nvme.Subsystems[in.NvMeController.Spec.SubsystemId.Value]
if !ok {
msg := fmt.Sprintf("unable to find subsystem with id %v", in.NvMeController.Spec.SubsystemId.Value)
log.Printf("error: %v", msg)
return nil, status.Error(codes.FailedPrecondition, msg)
}
log.Printf("Found subsystem: %v", subsys.Spec.Nqn)

controllerID := in.NvMeController.Spec.Id.Value
_, ok = s.nvme.Controllers[controllerID]
if ok {
msg := fmt.Sprintf("Already existing controller with id %v", controllerID)
log.Printf("error: %v", msg)
return nil, status.Error(codes.AlreadyExists, msg)
}

params := models.NvmfSubsystemAddListenerParams{}
params.Nqn = subsys.Spec.Nqn
params.ListenAddress.Trtype = mevTransportType
params.ListenAddress.Traddr = calculateTransportAddr(in.NvMeController.Spec.PcieId)

var result models.NvmfSubsystemAddListenerResult
err = s.rpc.Call("nvmf_subsystem_add_listener", &params, &result)
if err != nil {
log.Printf("error: %v", err)
return nil, status.Errorf(codes.FailedPrecondition, "failed to execute SPDK call")
}
log.Printf("Received from SPDK: %v", result)
if !result {
msg := fmt.Sprintf("could not create NVMe controller: %v", controllerID)
log.Print(msg)
return nil, status.Errorf(codes.FailedPrecondition, msg)
}

in.NvMeController.Spec.NvmeControllerId = -1
in.NvMeController.Status = &pb.NVMeControllerStatus{Active: true}
s.nvme.Controllers[controllerID] = in.NvMeController

response := &pb.NVMeController{}
err = deepcopier.Copy(in.NvMeController).To(response)
if err != nil {
log.Printf("error: %v", err)
return nil, status.Errorf(codes.Internal, "Failed to create response")
}
return response, nil
}

// DeleteNVMeController deletes an NVMe Controller
func (s *Server) DeleteNVMeController(ctx context.Context, in *pb.DeleteNVMeControllerRequest) (*emptypb.Empty, error) {
log.Printf("DeleteNVMeController: Received from client: %v", in)
controller, ok := s.nvme.Controllers[in.Name]
if !ok {
msg := fmt.Sprintf("unable to find controller with id %v", in.Name)
log.Printf("error: %v", msg)
return nil, status.Error(codes.FailedPrecondition, msg)
}

subsys, ok := s.nvme.Subsystems[controller.Spec.SubsystemId.Value]
if !ok {
msg := fmt.Sprintf("unable to find subsystem with id %v for controller %v",
controller.Spec.SubsystemId.Value,
in.Name)
log.Printf("error: %v", msg)
return nil, status.Error(codes.FailedPrecondition, msg)
}

params := models.NvmfSubsystemAddListenerParams{}
params.Nqn = subsys.Spec.Nqn
params.ListenAddress.Trtype = mevTransportType
params.ListenAddress.Traddr = calculateTransportAddr(controller.Spec.PcieId)
var result models.NvmfSubsystemAddListenerResult
err := s.rpc.Call("nvmf_subsystem_remove_listener", &params, &result)
if err != nil {
log.Printf("error: %v", err)
return nil, status.Errorf(codes.FailedPrecondition, "Failed to execute SPDK call")
}
log.Printf("Received from SPDK: %v", result)
if !result {
msg := fmt.Sprintf("Could not delete controller with id %v on subsystem %v",
controller.Spec.NvmeControllerId,
subsys.Spec.Nqn)
log.Print(msg)
return nil, status.Errorf(codes.FailedPrecondition, msg)
}

delete(s.nvme.Controllers, controller.Spec.Id.Value)
return &emptypb.Empty{}, nil
type npiSubsystemListener struct {
}

// UpdateNVMeController updates an NVMe Controller
func (s *Server) UpdateNVMeController(ctx context.Context, in *pb.UpdateNVMeControllerRequest) (*pb.NVMeController, error) {
log.Printf("UpdateNVMeController: Received from client: %v", in)
return nil, status.Errorf(codes.Unimplemented, "UpdateNVMeController method is not implemented")
// NewSubsystemListener creates a new instance of a SubsystemListener for npi transport
func NewSubsystemListener() frontend.SubsystemListener {
return npiSubsystemListener{}
}

func verifyCreateNvmeControllerRequestArgs(in *pb.CreateNVMeControllerRequest) error {
var err error
switch {
case in.NvMeController == nil:
err = status.Error(codes.InvalidArgument, "NvMeController field should be specified")
case in.NvMeController.Spec == nil:
err = status.Error(codes.InvalidArgument, "Spec field should be specified")
case in.NvMeController.Spec.Id == nil || in.NvMeController.Spec.Id.Value == "":
err = status.Error(codes.InvalidArgument, "ControllerId field should be specified")
case in.NvMeController.Spec.SubsystemId == nil || in.NvMeController.Spec.SubsystemId.Value == "":
err = status.Error(codes.InvalidArgument, "SubsystemId field should be specified")
case in.NvMeController.Spec.PcieId == nil:
err = status.Error(codes.InvalidArgument, "PcieId field should be specified")
}

if err != nil {
log.Printf("error: %v", err)
}

return err
func (c npiSubsystemListener) Params(ctrlr *pb.NVMeController, nqn string) models.NvmfSubsystemAddListenerParams {
result := models.NvmfSubsystemAddListenerParams{}
result.Nqn = nqn
result.ListenAddress.Trtype = "npi"
result.ListenAddress.Traddr = calculateTransportAddr(ctrlr.Spec.PcieId)
return result
}

func calculateTransportAddr(pci *pb.PciEndpoint) string {
Expand Down