bdev_rbd: handle rbd_with_spdk_wq conf option

Signed-off-by: Alexander Indenbaum <aindenba@redhat.com>

Author: Alexander Indenbaum

module/bdev/rbd/bdev_rbd.c

@@ -33,6 +33,7 @@ static int bdev_rbd_count = 0;
  * global parameter to control CRC32C usage in RBD write operations.
  */
 static bool g_rbd_with_crc32c = false;
+static bool g_rbd_with_spdk_wq = false;
 
 struct bdev_rbd_pool_ctx {
 	rados_t *cluster_p;
@@ -509,10 +510,16 @@ bdev_rbd_init_context(void *arg)
 	}
 
 	assert(io_ctx != NULL);
-	/* Find reactor thread, create SpdkContextWQ if available, then open with context_wq (NULL uses default AsioContextWQ) */
-	struct spdk_thread *reactor_thread = bdev_rbd_find_reactor_thread();
-	rbd->spdk_context_wq = bdev_rbd_spdk_context_wq_create_from_ioctx(
-		*io_ctx, reactor_thread);
+	if (g_rbd_with_spdk_wq) {
+		/* Find reactor thread, create SpdkContextWQ if available, then open with context_wq (NULL uses default AsioContextWQ) */
+		struct spdk_thread *reactor_thread = bdev_rbd_find_reactor_thread();
+		rbd->spdk_context_wq = bdev_rbd_spdk_context_wq_create_from_ioctx(
+			*io_ctx, reactor_thread);
+	} else {
+		rbd->spdk_context_wq = NULL;
+		SPDK_NOTICELOG("rbd_with_spdk_wq is disabled, using AsioContextWQ for RBD image %s/%s\n",
+			       rbd->pool_name, rbd->rbd_name);
+	}
 	if (rbd->rbd_read_only) {
 		SPDK_DEBUGLOG(bdev_rbd, "Will open RBD image %s/%s as read-only\n", rbd->pool_name, rbd->rbd_name);
 		rc = rbd_open_read_only_with_context_wq(*io_ctx, rbd->rbd_name, &rbd->image, NULL, rbd->spdk_context_wq);
@@ -2013,3 +2020,16 @@ bdev_rbd_set_with_crc32c(bool enable)
 {
 	g_rbd_with_crc32c = enable;
 }
+
+bool
+bdev_rbd_get_with_spdk_wq(void)
+{
+	return g_rbd_with_spdk_wq;
+}
+
+/** enable or disable SPDK ContextWQ for RBD operations */
+void
+bdev_rbd_set_with_spdk_wq(bool enable)
+{
+	g_rbd_with_spdk_wq = enable;
+}

module/bdev/rbd/bdev_rbd.h

@@ -96,4 +96,19 @@ bool bdev_rbd_get_with_crc32c(void);
  */
 void bdev_rbd_set_with_crc32c(bool enable);
 
+/**
+ * Get the current rbd_with_spdk_wq setting.
+ *
+ * \return true if SPDK ContextWQ is enabled, false otherwise
+ */
+bool bdev_rbd_get_with_spdk_wq(void);
+
+/**
+ * Set the rbd_with_spdk_wq parameter to enable/disable SPDK ContextWQ
+ * for RBD operations.
+ *
+ * \param enable true to enable SPDK ContextWQ, false to disable (uses AsioContextWQ)
+ */
+void bdev_rbd_set_with_spdk_wq(bool enable);
+
 #endif /* SPDK_BDEV_RBD_H */

module/bdev/rbd/bdev_rbd_rpc.c

@@ -439,3 +439,53 @@ SPDK_RPC_REGISTER("bdev_rbd_wait_for_latest_osdmap", rpc_bdev_rbd_wait_for_lates
 
 SPDK_RPC_REGISTER("bdev_rbd_get_with_crc32c", rpc_bdev_rbd_get_with_crc32c, SPDK_RPC_RUNTIME)
 SPDK_RPC_REGISTER("bdev_rbd_set_with_crc32c", rpc_bdev_rbd_set_with_crc32c, SPDK_RPC_STARTUP)
+
+/**
+ * RPC function to get the current rbd_with_spdk_wq setting
+ */
+static void
+rpc_bdev_rbd_get_with_spdk_wq(struct spdk_jsonrpc_request *request,
+			      const struct spdk_json_val *params)
+{
+	struct spdk_json_write_ctx *w;
+
+	w = spdk_jsonrpc_begin_result(request);
+	spdk_json_write_bool(w, bdev_rbd_get_with_spdk_wq());
+	spdk_jsonrpc_end_result(request, w);
+}
+
+/**
+ * RPC function to set the rbd_with_spdk_wq parameter
+ */
+struct rpc_bdev_rbd_set_with_spdk_wq {
+	bool enable;
+};
+
+static const struct spdk_json_object_decoder rpc_bdev_rbd_set_with_spdk_wq_decoders[] = {
+	{"enable", offsetof(struct rpc_bdev_rbd_set_with_spdk_wq, enable), spdk_json_decode_bool},
+};
+
+static void
+rpc_bdev_rbd_set_with_spdk_wq(struct spdk_jsonrpc_request *request,
+			     const struct spdk_json_val *params)
+{
+	struct rpc_bdev_rbd_set_with_spdk_wq req = {};
+	struct spdk_json_write_ctx *w;
+
+	if (spdk_json_decode_object(params, rpc_bdev_rbd_set_with_spdk_wq_decoders,
+				    SPDK_COUNTOF(rpc_bdev_rbd_set_with_spdk_wq_decoders),
+				    &req)) {
+		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
+						"Missing or invalid enable parameter");
+		return;
+	}
+
+	bdev_rbd_set_with_spdk_wq(req.enable);
+
+	w = spdk_jsonrpc_begin_result(request);
+	spdk_json_write_bool(w, bdev_rbd_get_with_spdk_wq());
+	spdk_jsonrpc_end_result(request, w);
+}
+
+SPDK_RPC_REGISTER("bdev_rbd_get_with_spdk_wq", rpc_bdev_rbd_get_with_spdk_wq, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER("bdev_rbd_set_with_spdk_wq", rpc_bdev_rbd_set_with_spdk_wq, SPDK_RPC_STARTUP)

python/spdk/rpc/bdev.py

@@ -1167,6 +1167,24 @@ def bdev_rbd_set_with_crc32c(client, enable):
     return client.call('bdev_rbd_set_with_crc32c', params)
 
 
+def bdev_rbd_get_with_spdk_wq(client):
+    """Get SPDK ContextWQ usage in RBD operations.
+    Returns:
+        True if SPDK ContextWQ is enabled, False otherwise
+    """
+    return client.call('bdev_rbd_get_with_spdk_wq')
+
+
+def bdev_rbd_set_with_spdk_wq(client, enable):
+    """Set SPDK ContextWQ usage in RBD operations.
+    Args:
+        enable: enable or disable SPDK ContextWQ (False uses AsioContextWQ)
+    """
+    params = dict()
+    params['enable'] = enable
+    return client.call('bdev_rbd_set_with_spdk_wq', params)
+
+
 @deprecated_method
 def bdev_error_create(client, base_name, uuid=None):
     """Construct an error injection block device.