Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2019-04-04 16:57:03 +0200
committerJohannes Thumshirn <jthumshirn@suse.de>2019-04-04 16:57:03 +0200
commit91b3150d7e1530f099d0b08bd9110f54f688d7ad (patch)
tree75b5a9740aab66fb1e0334fb58f610c05d68e2f2
parentcd6148ef5370b9430589a400f068f15a84792893 (diff)
Refresh
patches.drivers/nvmet-tcp-add-NVMe-over-TCP-target-driver.patch. The NVMe over Fabrics TCP Transport was introduced in the upstream kernel after commit aa563d7bca6e ("iov_iter: Separate type from direction and use accessor functions") changed the way a iov iterator is initialized. This causes the BUG_ON() in iov_iter_bvec() checking if the ITER_BVEC flag is set to trigger, as the newer upstream variant doesn't need this anymore. Set the flag in nvmet_tcp_map_pdu_iovec()'s call to iov_iter_kvec() and we're safe again.
-rw-r--r--patches.drivers/nvmet-tcp-add-NVMe-over-TCP-target-driver.patch22
1 files changed, 6 insertions, 16 deletions
diff --git a/patches.drivers/nvmet-tcp-add-NVMe-over-TCP-target-driver.patch b/patches.drivers/nvmet-tcp-add-NVMe-over-TCP-target-driver.patch
index ccfcfadf0a..69483cae34 100644
--- a/patches.drivers/nvmet-tcp-add-NVMe-over-TCP-target-driver.patch
+++ b/patches.drivers/nvmet-tcp-add-NVMe-over-TCP-target-driver.patch
@@ -19,14 +19,12 @@ Signed-off-by: Solganik Alexander <sashas@lightbitslabs.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Hannes Reinecke <hare@suse.com>
---
- drivers/nvme/target/Kconfig | 10 +
- drivers/nvme/target/Makefile | 2 +
- drivers/nvme/target/tcp.c | 1737 ++++++++++++++++++++++++++++++++++++++++++
+ drivers/nvme/target/Kconfig | 10
+ drivers/nvme/target/Makefile | 2
+ drivers/nvme/target/tcp.c | 1737 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 1749 insertions(+)
create mode 100644 drivers/nvme/target/tcp.c
-diff --git a/drivers/nvme/target/Kconfig b/drivers/nvme/target/Kconfig
-index 3c7b61ddb0d1..d94f25cde019 100644
--- a/drivers/nvme/target/Kconfig
+++ b/drivers/nvme/target/Kconfig
@@ -60,3 +60,13 @@ config NVME_TARGET_FCLOOP
@@ -43,11 +41,9 @@ index 3c7b61ddb0d1..d94f25cde019 100644
+ devices over TCP.
+
+ If unsure, say N.
-diff --git a/drivers/nvme/target/Makefile b/drivers/nvme/target/Makefile
-index 8118c93391c6..8c3ad0fb6860 100644
--- a/drivers/nvme/target/Makefile
+++ b/drivers/nvme/target/Makefile
-@@ -5,6 +5,7 @@ obj-$(CONFIG_NVME_TARGET_LOOP) += nvme-loop.o
+@@ -4,6 +4,7 @@ obj-$(CONFIG_NVME_TARGET_LOOP) += nvme-
obj-$(CONFIG_NVME_TARGET_RDMA) += nvmet-rdma.o
obj-$(CONFIG_NVME_TARGET_FC) += nvmet-fc.o
obj-$(CONFIG_NVME_TARGET_FCLOOP) += nvme-fcloop.o
@@ -55,14 +51,11 @@ index 8118c93391c6..8c3ad0fb6860 100644
nvmet-y += core.o configfs.o admin-cmd.o fabrics-cmd.o \
discovery.o io-cmd-file.o io-cmd-bdev.o
-@@ -12,3 +13,4 @@ nvme-loop-y += loop.o
+@@ -11,3 +12,4 @@ nvme-loop-y += loop.o
nvmet-rdma-y += rdma.o
nvmet-fc-y += fc.o
nvme-fcloop-y += fcloop.o
+nvmet-tcp-y += tcp.o
-diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
-new file mode 100644
-index 000000000000..d31bec260160
--- /dev/null
+++ b/drivers/nvme/target/tcp.c
@@ -0,0 +1,1737 @@
@@ -370,7 +363,7 @@ index 000000000000..d31bec260160
+ iov++;
+ }
+
-+ iov_iter_kvec(&cmd->recv_msg.msg_iter, READ, cmd->iov,
++ iov_iter_kvec(&cmd->recv_msg.msg_iter, ITER_KVEC | READ, cmd->iov,
+ cmd->nr_mapped, cmd->pdu_len);
+}
+
@@ -1803,6 +1796,3 @@ index 000000000000..d31bec260160
+
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("nvmet-transport-3"); /* 3 == NVMF_TRTYPE_TCP */
---
-2.16.4
-