update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / etc / spdk / nvmf.conf.in

diff --git a/ceph/src/spdk/etc/spdk/nvmf.conf.in b/ceph/src/spdk/etc/spdk/nvmf.conf.in
index 7df0cd00b07c57a5adb2cdf965cf3031b818f1a2..5799f65cfbd85e55a8819c4951c322b82d1ed881 100644 (file)
--- a/ceph/src/spdk/etc/spdk/nvmf.conf.in
+++ b/ceph/src/spdk/etc/spdk/nvmf.conf.in
@@ -65,6 +65,15 @@
   # poll. Units in microseconds.
   AcceptorPollRate 10000
 
+  # Set how the connection is scheduled among multiple threads, current supported string value are
+  # "RoundRobin", "Host", "Transport".
+  # RoundRobin: Schedule the connection with roundrobin manner.
+  # Host: Schedule the connection according to host IP.
+  # Transport: Schedule the connection according to the transport characteristics.
+  #  For example, for  TCP transport, we can schedule the connection according to socket NAPI_ID info.
+  #  The connection which has the same socket NAPI_ID info will be grouped in the same polling group.
+  ConnectionScheduler RoundRobin
+
 # One valid transport type must be set in each [Transport].
 # The first is the case of RDMA transport and the second is the case of TCP transport.
 [Transport]
@@ -134,6 +143,28 @@
   # Set the number of shared buffers to be cached per poll group
   #BufCacheSize 32
 
+  # Set whether to use the C2H Success optimization, only used for TCP transport.
+  # C2HSuccess true
+
+  # Set whether to use different priority for socket, only used for TCP transport.
+  # SockPriority 0
+
+# Define FC transport
+#[Transport]
+  # Set FC transport type.
+  #Type FC
+
+  # Set the maximum number of submission and completion queues per session.
+  # Setting this to '8', for example, allows for 8 submission and 8 completion queues
+  # per session.
+  #MaxQueuesPerSession 5
+
+  # Set the maximum number of outstanding I/O per queue.
+  #MaxQueueDepth 128
+
+  # Set the maximum I/O size. Must be a multiple of 4096.
+  #MaxIOSize 65536
+
 [Nvme]
   # NVMe Device Whitelist
   # Users may specify which NVMe devices to claim by their transport id.
@@ -171,6 +202,10 @@
   # Default: No
   HotplugEnable No
 
+  # Enable/disable delayed NVMe command submission.
+  # Default: True.
+  DelayCmdSubmit True
+
 # The Split virtual block device slices block devices into multiple smaller bdevs.
 [Split]
   # Syntax:
@@ -204,7 +239,7 @@
 # - NQN is required and must be unique.
 # - Between 1 and 255 Listen directives are allowed. This defines
 #   the addresses on which new connections may be accepted. The format
-#   is Listen <type> <address> where type currently can only be RDMA.
+#   is Listen <type> <address> where type can be RDMA, TCP or FC.
 # - Between 0 and 255 Host directives are allowed. This defines the
 #   NQNs of allowed hosts. If no Host directive is specified, all hosts
 #   are allowed to connect.
@@ -245,3 +280,16 @@
   Namespace Malloc1
   Namespace AIO0
   Namespace AIO1
+
+# Subsystem with FC listen address directive
+# - Listen option allows subsystem access on specific FC ports identified
+#   by WWNN-WWPN. Each subsystem allows 0 - 255 listen directives.
+#   If no listen directive is provided, subsystem can be accessed on all
+#   avialable FC links permitted by FC zoning rules.
+#
+# [Subsystem3]
+  #NQN nqn.2016-06.io.spdk:cnode3
+  #Listen FC "nn-0x20000090fac7ca5c:pn-0x10000090fac7ca5c"
+  #AllowAnyHost Yes
+  #SN SPDK00000000000003
+  #Namespace Malloc4