diff --git a/lib/bdev/nvme/Makefile b/lib/bdev/nvme/Makefile
index bd06f71cd..e4251c261 100644
--- a/lib/bdev/nvme/Makefile
+++ b/lib/bdev/nvme/Makefile
@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
-C_SRCS = blockdev_nvme.c
+C_SRCS = blockdev_nvme.c blockdev_nvme_rpc.c
 LIBNAME = bdev_nvme
 
 include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/lib/bdev/nvme/blockdev_nvme_rpc.c b/lib/bdev/nvme/blockdev_nvme_rpc.c
new file mode 100644
index 000000000..139505b94
--- /dev/null
+++ b/lib/bdev/nvme/blockdev_nvme_rpc.c
@@ -0,0 +1,102 @@
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright (c) Intel Corporation.
+ *   All rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "blockdev_nvme.h"
+#include "spdk/log.h"
+#include "spdk/rpc.h"
+
+struct rpc_construct_nvme {
+	char *pci_address;
+};
+
+static void
+free_rpc_construct_nvme(struct rpc_construct_nvme *req)
+{
+	free(req->pci_address);
+}
+
+static const struct spdk_json_object_decoder rpc_construct_nvme_decoders[] = {
+	{"pci_address", offsetof(struct rpc_construct_nvme, pci_address), spdk_json_decode_string},
+};
+
+static void
+spdk_rpc_construct_nvme_bdev(struct spdk_jsonrpc_server_conn *conn,
+			     const struct spdk_json_val *params,
+			     const struct spdk_json_val *id)
+{
+	struct rpc_construct_nvme req = {};
+	struct spdk_json_write_ctx *w;
+	struct nvme_probe_ctx ctx = {};
+	unsigned int domain, bus, dev, func;
+	int rc;
+
+	if (spdk_json_decode_object(params, rpc_construct_nvme_decoders,
+				    sizeof(rpc_construct_nvme_decoders) / sizeof(*rpc_construct_nvme_decoders),
+				    &req)) {
+		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");
+		goto invalid;
+	}
+
+	ctx.controllers_remaining = 1;
+	ctx.num_whitelist_controllers = 1;
+
+	rc = sscanf(req.pci_address, "%x:%x:%x.%x", &domain, &bus, &dev, &func);
+	if (rc != 4) {
+		goto invalid;
+	}
+
+	ctx.whitelist[0].domain = domain;
+	ctx.whitelist[0].bus = bus;
+	ctx.whitelist[0].dev = dev;
+	ctx.whitelist[0].func = func;
+
+	if (spdk_bdev_nvme_create(&ctx)) {
+		goto invalid;
+	}
+
+	free_rpc_construct_nvme(&req);
+
+	if (id == NULL) {
+		return;
+	}
+
+	w = spdk_jsonrpc_begin_result(conn, id);
+	spdk_json_write_bool(w, true);
+	spdk_jsonrpc_end_result(conn, w);
+	return;
+
+invalid:
+	spdk_jsonrpc_send_error_response(conn, id, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
+	free_rpc_construct_nvme(&req);
+}
+SPDK_RPC_REGISTER("construct_nvme_bdev", spdk_rpc_construct_nvme_bdev)