Commit ff5d362e authored by yidong0635's avatar yidong0635 Committed by Jim Harris
Browse files

etc/spdk: add raid bdev related configurations in conf files. 



Now we need to add configurations in these files to run cases.
Add some settings in conf files for user to choose freely.

Raid bdev can be comprised of AIO/Nvme/Malloc.

Change-Id: Ifdab8539c89d2cf4fcd88ca7f26e8563e12dd585
Signed-off-by: default avataryidong0635 <dongx.yi@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/449772


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 1fb629c4

etc/spdk/iscsi.conf.in

+19 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ 
# Offload is disabled by default even it is available.

[Malloc]

  # Number of Malloc targets

  NumberOfLuns 3

  NumberOfLuns 5

  # Malloc targets are 128M

  LunSizeInMB 128

  # Block size. Default is 512 bytes.
@@ -184,6 +184,23 @@ 
  # leaving the rest of the device inaccessible

  Split Malloc2 8 1



# The RAID virtual block device based on pre-configured block device.

[RAID1]

  # Unique name of this RAID device.

  Name Raid0

  # RAID level, only raid level 0 is supported.

  RaidLevel 0

  # Strip size in KB.

  StripSize 64

  # Number of pre-configured bdevs.

  NumDevices 2

  # Pre-configured bdevs name with Nvme.

  #Devices Nvme0n1 Nvme1n1

  # Pre-configured bdevs name with Malloc.

  Devices Malloc3 Malloc4

  # Pre-configured bdevs name with AIO.

  #Devices AIO0 AIO1



# Users should change the TargetNode section(s) below to match the

#  desired iSCSI target node configuration.

# TargetName, Mapping, LUN0 are minimum required
@@ -214,4 +231,5 @@ 
  AuthGroup AuthGroup1

  UseDigest Auto

  LUN0 Nvme0n1

  LUN1 Raid0

  QueueDepth 32

etc/spdk/nvmf.conf.in

+5 −1
Original line number Diff line number Diff line
@@ -193,8 +193,12 @@ 
  StripSize 64

  # Number of pre-configured bdevs.

  NumDevices 2

  # Pre-configured bdevs name.

  # Pre-configured bdevs name with Nvme.

  Devices Nvme2n1 Nvme3n1

  # Pre-configured bdevs name with Malloc.

  #Devices Malloc0 Malloc1

  # Pre-configured bdevs name with AIO.

  #Devices AIO0 AIO1



# Define an NVMf Subsystem.

# - NQN is required and must be unique.

etc/spdk/vhost.conf.in

+23 −0
Original line number Diff line number Diff line
@@ -110,6 +110,23 @@ 
  # leaving the rest of the device inaccessible

  #Split Malloc2 8 1



# The RAID virtual block device based on pre-configured block device.

[RAID1]

  # Unique name of this RAID device.

  Name Raid0

  # RAID level, only raid level 0 is supported.

  RaidLevel 0

  # Strip size in KB.

  StripSize 64

  # Number of pre-configured bdevs.

  NumDevices 2

  # Pre-configured bdevs name with Nvme.

  #Devices Nvme0n1 Nvme1n1

  # Pre-configured bdevs name with Malloc.

  Devices Malloc1 Malloc2

  # Pre-configured bdevs name with AIO.

  #Devices AIO0 AIO1



# Vhost scsi controller configuration

# Users should change the VhostScsi section(s) below to match the desired

# vhost configuration.
@@ -149,6 +166,12 @@ 
  #  SPDK process.

  #Cpumask 0x1



#[VhostBlk1]

  # Define name for controller

  #Name vhost.2

  # Use device which named Raid0

  #Dev Raid0



#[VhostNvme0]

  # Define name for controller

  #Name vhost.0