Adding upstream version 18.2.2.upstream/18.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 489 insertions, 0 deletions

diff --git a/src/spdk/module/blob/Makefile b/src/spdk/module/blob/Makefile
new file mode 100644
index 000000000..744a0a4a4
--- /dev/null
+++ b/src/spdk/module/blob/Makefile
@@ -0,0 +1,44 @@
+#
+#  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.
+#
+
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+
+DIRS-y = bdev
+
+.PHONY: all clean $(DIRS-y)
+
+all: $(DIRS-y)
+clean: $(DIRS-y)
+
+include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk
diff --git a/src/spdk/module/blob/bdev/Makefile b/src/spdk/module/blob/bdev/Makefile
new file mode 100644
index 000000000..d40f6afb8
--- /dev/null
+++ b/src/spdk/module/blob/bdev/Makefile
@@ -0,0 +1,45 @@
+#
+#  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.
+#
+
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+
+SO_VER := 3
+SO_MINOR := 0
+
+C_SRCS = blob_bdev.c
+LIBNAME = blob_bdev
+
+SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_blob_bdev.map)
+
+include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/src/spdk/module/blob/bdev/blob_bdev.c b/src/spdk/module/blob/bdev/blob_bdev.c
new file mode 100644
index 000000000..67949fcfe
--- /dev/null
+++ b/src/spdk/module/blob/bdev/blob_bdev.c
@@ -0,0 +1,390 @@
+/*-
+ *   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 "spdk/stdinc.h"
+
+#include "spdk/blob_bdev.h"
+#include "spdk/blob.h"
+#include "spdk/thread.h"
+#include "spdk/log.h"
+#include "spdk/endian.h"
+#include "spdk/bdev_module.h"
+
+struct blob_bdev {
+	struct spdk_bs_dev	bs_dev;
+	struct spdk_bdev	*bdev;
+	struct spdk_bdev_desc	*desc;
+	bool			claimed;
+};
+
+struct blob_resubmit {
+	struct spdk_bdev_io_wait_entry bdev_io_wait;
+	enum spdk_bdev_io_type io_type;
+	struct spdk_bs_dev *dev;
+	struct spdk_io_channel *channel;
+	void *payload;
+	int iovcnt;
+	uint64_t lba;
+	uint32_t lba_count;
+	struct spdk_bs_dev_cb_args *cb_args;
+};
+static void bdev_blob_resubmit(void *);
+
+static inline struct spdk_bdev_desc *
+__get_desc(struct spdk_bs_dev *dev)
+{
+	return ((struct blob_bdev *)dev)->desc;
+}
+
+static inline struct spdk_bdev *
+__get_bdev(struct spdk_bs_dev *dev)
+{
+	return ((struct blob_bdev *)dev)->bdev;
+}
+
+static void
+bdev_blob_io_complete(struct spdk_bdev_io *bdev_io, bool success, void *arg)
+{
+	struct spdk_bs_dev_cb_args *cb_args = arg;
+	int bserrno;
+
+	if (success) {
+		bserrno = 0;
+	} else {
+		bserrno = -EIO;
+	}
+	cb_args->cb_fn(cb_args->channel, cb_args->cb_arg, bserrno);
+	spdk_bdev_free_io(bdev_io);
+}
+
+static void
+bdev_blob_queue_io(struct spdk_bs_dev *dev, struct spdk_io_channel *channel, void *payload,
+		   int iovcnt,
+		   uint64_t lba, uint32_t lba_count, enum spdk_bdev_io_type io_type,
+		   struct spdk_bs_dev_cb_args *cb_args)
+{
+	int rc;
+	struct spdk_bdev *bdev = __get_bdev(dev);
+	struct blob_resubmit *ctx;
+
+	ctx = calloc(1, sizeof(struct blob_resubmit));
+
+	if (ctx == NULL) {
+		SPDK_ERRLOG("Not enough memory to queue io\n");
+		cb_args->cb_fn(cb_args->channel, cb_args->cb_arg, -ENOMEM);
+		return;
+	}
+
+	ctx->io_type = io_type;
+	ctx->dev = dev;
+	ctx->channel = channel;
+	ctx->payload = payload;
+	ctx->iovcnt = iovcnt;
+	ctx->lba = lba;
+	ctx->lba_count = lba_count;
+	ctx->cb_args = cb_args;
+	ctx->bdev_io_wait.bdev = bdev;
+	ctx->bdev_io_wait.cb_fn = bdev_blob_resubmit;
+	ctx->bdev_io_wait.cb_arg = ctx;
+
+	rc = spdk_bdev_queue_io_wait(bdev, channel, &ctx->bdev_io_wait);
+	if (rc != 0) {
+		SPDK_ERRLOG("Queue io failed, rc=%d\n", rc);
+		cb_args->cb_fn(cb_args->channel, cb_args->cb_arg, rc);
+		free(ctx);
+		assert(false);
+	}
+}
+
+static void
+bdev_blob_read(struct spdk_bs_dev *dev, struct spdk_io_channel *channel, void *payload,
+	       uint64_t lba, uint32_t lba_count, struct spdk_bs_dev_cb_args *cb_args)
+{
+	int rc;
+
+	rc = spdk_bdev_read_blocks(__get_desc(dev), channel, payload, lba,
+				   lba_count, bdev_blob_io_complete, cb_args);
+	if (rc == -ENOMEM) {
+		bdev_blob_queue_io(dev, channel, payload, 0, lba,
+				   lba_count, SPDK_BDEV_IO_TYPE_READ, cb_args);
+	} else if (rc != 0) {
+		cb_args->cb_fn(cb_args->channel, cb_args->cb_arg, rc);
+	}
+}
+
+static void
+bdev_blob_write(struct spdk_bs_dev *dev, struct spdk_io_channel *channel, void *payload,
+		uint64_t lba, uint32_t lba_count, struct spdk_bs_dev_cb_args *cb_args)
+{
+	int rc;
+
+	rc = spdk_bdev_write_blocks(__get_desc(dev), channel, payload, lba,
+				    lba_count, bdev_blob_io_complete, cb_args);
+	if (rc == -ENOMEM) {
+		bdev_blob_queue_io(dev, channel, payload, 0, lba,
+				   lba_count, SPDK_BDEV_IO_TYPE_WRITE, cb_args);
+	} else if (rc != 0) {
+		cb_args->cb_fn(cb_args->channel, cb_args->cb_arg, rc);
+	}
+}
+
+static void
+bdev_blob_readv(struct spdk_bs_dev *dev, struct spdk_io_channel *channel,
+		struct iovec *iov, int iovcnt,
+		uint64_t lba, uint32_t lba_count, struct spdk_bs_dev_cb_args *cb_args)
+{
+	int rc;
+
+	rc = spdk_bdev_readv_blocks(__get_desc(dev), channel, iov, iovcnt, lba,
+				    lba_count, bdev_blob_io_complete, cb_args);
+	if (rc == -ENOMEM) {
+		bdev_blob_queue_io(dev, channel, iov, iovcnt, lba,
+				   lba_count, SPDK_BDEV_IO_TYPE_READ, cb_args);
+	} else if (rc != 0) {
+		cb_args->cb_fn(cb_args->channel, cb_args->cb_arg, rc);
+	}
+}
+
+static void
+bdev_blob_writev(struct spdk_bs_dev *dev, struct spdk_io_channel *channel,
+		 struct iovec *iov, int iovcnt,
+		 uint64_t lba, uint32_t lba_count, struct spdk_bs_dev_cb_args *cb_args)
+{
+	int rc;
+
+	rc = spdk_bdev_writev_blocks(__get_desc(dev), channel, iov, iovcnt, lba,
+				     lba_count, bdev_blob_io_complete, cb_args);
+	if (rc == -ENOMEM) {
+		bdev_blob_queue_io(dev, channel, iov, iovcnt, lba,
+				   lba_count, SPDK_BDEV_IO_TYPE_WRITE, cb_args);
+	} else if (rc != 0) {
+		cb_args->cb_fn(cb_args->channel, cb_args->cb_arg, rc);
+	}
+}
+
+static void
+bdev_blob_write_zeroes(struct spdk_bs_dev *dev, struct spdk_io_channel *channel, uint64_t lba,
+		       uint32_t lba_count, struct spdk_bs_dev_cb_args *cb_args)
+{
+	int rc;
+
+	rc = spdk_bdev_write_zeroes_blocks(__get_desc(dev), channel, lba,
+					   lba_count, bdev_blob_io_complete, cb_args);
+	if (rc == -ENOMEM) {
+		bdev_blob_queue_io(dev, channel, NULL, 0, lba,
+				   lba_count, SPDK_BDEV_IO_TYPE_WRITE_ZEROES, cb_args);
+	} else if (rc != 0) {
+		cb_args->cb_fn(cb_args->channel, cb_args->cb_arg, rc);
+	}
+}
+
+static void
+bdev_blob_unmap(struct spdk_bs_dev *dev, struct spdk_io_channel *channel, uint64_t lba,
+		uint32_t lba_count, struct spdk_bs_dev_cb_args *cb_args)
+{
+	struct blob_bdev *blob_bdev = (struct blob_bdev *)dev;
+	int rc;
+
+	if (spdk_bdev_io_type_supported(blob_bdev->bdev, SPDK_BDEV_IO_TYPE_UNMAP)) {
+		rc = spdk_bdev_unmap_blocks(__get_desc(dev), channel, lba, lba_count,
+					    bdev_blob_io_complete, cb_args);
+		if (rc == -ENOMEM) {
+			bdev_blob_queue_io(dev, channel, NULL, 0, lba,
+					   lba_count, SPDK_BDEV_IO_TYPE_UNMAP, cb_args);
+		} else if (rc != 0) {
+			cb_args->cb_fn(cb_args->channel, cb_args->cb_arg, rc);
+		}
+	} else {
+		/*
+		 * If the device doesn't support unmap, immediately complete
+		 * the request. Blobstore does not rely on unmap zeroing
+		 * data.
+		 */
+		cb_args->cb_fn(cb_args->channel, cb_args->cb_arg, 0);
+	}
+}
+
+static void
+bdev_blob_resubmit(void *arg)
+{
+	struct blob_resubmit *ctx = (struct blob_resubmit *) arg;
+
+	switch (ctx->io_type) {
+	case SPDK_BDEV_IO_TYPE_READ:
+		if (ctx->iovcnt > 0) {
+			bdev_blob_readv(ctx->dev, ctx->channel, (struct iovec *)ctx->payload, ctx->iovcnt,
+					ctx->lba, ctx->lba_count, ctx->cb_args);
+		} else {
+			bdev_blob_read(ctx->dev, ctx->channel, ctx->payload,
+				       ctx->lba, ctx->lba_count, ctx->cb_args);
+		}
+		break;
+	case SPDK_BDEV_IO_TYPE_WRITE:
+		if (ctx->iovcnt > 0) {
+			bdev_blob_writev(ctx->dev, ctx->channel, (struct iovec *)ctx->payload, ctx->iovcnt,
+					 ctx->lba, ctx->lba_count, ctx->cb_args);
+		} else {
+			bdev_blob_write(ctx->dev, ctx->channel, ctx->payload,
+					ctx->lba, ctx->lba_count, ctx->cb_args);
+		}
+		break;
+	case SPDK_BDEV_IO_TYPE_UNMAP:
+		bdev_blob_unmap(ctx->dev, ctx->channel,
+				ctx->lba, ctx->lba_count, ctx->cb_args);
+		break;
+	case SPDK_BDEV_IO_TYPE_WRITE_ZEROES:
+		bdev_blob_write_zeroes(ctx->dev, ctx->channel,
+				       ctx->lba, ctx->lba_count, ctx->cb_args);
+		break;
+	default:
+		SPDK_ERRLOG("Unsupported io type %d\n", ctx->io_type);
+		assert(false);
+		break;
+	}
+	free(ctx);
+}
+
+int
+spdk_bs_bdev_claim(struct spdk_bs_dev *bs_dev, struct spdk_bdev_module *module)
+{
+	struct blob_bdev *blob_bdev = (struct blob_bdev *)bs_dev;
+	int rc;
+
+	rc = spdk_bdev_module_claim_bdev(blob_bdev->bdev, NULL, module);
+	if (rc != 0) {
+		SPDK_ERRLOG("could not claim bs dev\n");
+		return rc;
+	}
+
+	blob_bdev->claimed = true;
+
+	return rc;
+}
+
+static struct spdk_io_channel *
+bdev_blob_create_channel(struct spdk_bs_dev *dev)
+{
+	struct blob_bdev *blob_bdev = (struct blob_bdev *)dev;
+
+	return spdk_bdev_get_io_channel(blob_bdev->desc);
+}
+
+static void
+bdev_blob_destroy_channel(struct spdk_bs_dev *dev, struct spdk_io_channel *channel)
+{
+	spdk_put_io_channel(channel);
+}
+
+static void
+bdev_blob_destroy(struct spdk_bs_dev *bs_dev)
+{
+	struct spdk_bdev_desc *desc = __get_desc(bs_dev);
+	struct blob_bdev *blob_bdev = (struct blob_bdev *)bs_dev;
+
+	if (blob_bdev->claimed) {
+		spdk_bdev_module_release_bdev(blob_bdev->bdev);
+	}
+
+	spdk_bdev_close(desc);
+	free(bs_dev);
+}
+
+struct spdk_bs_dev *
+spdk_bdev_create_bs_dev(struct spdk_bdev *bdev, spdk_bdev_remove_cb_t remove_cb, void *remove_ctx)
+{
+	struct blob_bdev *b;
+	struct spdk_bdev_desc *desc;
+	int rc;
+
+	b = calloc(1, sizeof(*b));
+
+	if (b == NULL) {
+		SPDK_ERRLOG("could not allocate blob_bdev\n");
+		return NULL;
+	}
+
+	rc = spdk_bdev_open(bdev, true, remove_cb, remove_ctx, &desc);
+	if (rc != 0) {
+		free(b);
+		return NULL;
+	}
+
+	b->bdev = bdev;
+	b->desc = desc;
+	b->bs_dev.blockcnt = spdk_bdev_get_num_blocks(bdev);
+	b->bs_dev.blocklen = spdk_bdev_get_block_size(bdev);
+	b->bs_dev.create_channel = bdev_blob_create_channel;
+	b->bs_dev.destroy_channel = bdev_blob_destroy_channel;
+	b->bs_dev.destroy = bdev_blob_destroy;
+	b->bs_dev.read = bdev_blob_read;
+	b->bs_dev.write = bdev_blob_write;
+	b->bs_dev.readv = bdev_blob_readv;
+	b->bs_dev.writev = bdev_blob_writev;
+	b->bs_dev.write_zeroes = bdev_blob_write_zeroes;
+	b->bs_dev.unmap = bdev_blob_unmap;
+
+	return &b->bs_dev;
+}
+
+struct spdk_bs_dev *
+spdk_bdev_create_bs_dev_from_desc(struct spdk_bdev_desc *desc)
+{
+	struct blob_bdev *b;
+	struct spdk_bdev *bdev;
+
+	b = calloc(1, sizeof(*b));
+
+	if (b == NULL) {
+		SPDK_ERRLOG("could not allocate blob_bdev\n");
+		return NULL;
+	}
+
+	bdev = spdk_bdev_desc_get_bdev(desc);
+	assert(bdev != NULL);
+
+	b->bdev = bdev;
+	b->desc = desc;
+	b->bs_dev.blockcnt = spdk_bdev_get_num_blocks(bdev);
+	b->bs_dev.blocklen = spdk_bdev_get_block_size(bdev);
+	b->bs_dev.create_channel = bdev_blob_create_channel;
+	b->bs_dev.destroy_channel = bdev_blob_destroy_channel;
+	b->bs_dev.destroy = bdev_blob_destroy;
+	b->bs_dev.read = bdev_blob_read;
+	b->bs_dev.write = bdev_blob_write;
+	b->bs_dev.readv = bdev_blob_readv;
+	b->bs_dev.writev = bdev_blob_writev;
+	b->bs_dev.write_zeroes = bdev_blob_write_zeroes;
+	b->bs_dev.unmap = bdev_blob_unmap;
+
+	return &b->bs_dev;
+}
diff --git a/src/spdk/module/blob/bdev/spdk_blob_bdev.map b/src/spdk/module/blob/bdev/spdk_blob_bdev.map
new file mode 100644
index 000000000..0149b3ab6
--- /dev/null
+++ b/src/spdk/module/blob/bdev/spdk_blob_bdev.map
@@ -0,0 +1,10 @@
+{
+	global:
+
+	# public functions
+	spdk_bdev_create_bs_dev;
+	spdk_bdev_create_bs_dev_from_desc;
+	spdk_bs_bdev_claim;
+
+	local: *;
+};