Merge ~paelzer/ubuntu/+source/rdma-core:lp-1823836-clear-cmd-buffer-disco into ubuntu/+source/rdma-core:ubuntu/disco-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1823836-rdma-core-mem-clear/+packages
Bug: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/1823836

No Eoan MP as the importer is still stuck, but it would be the same except the version number being 22.1-1ubuntu1 then

[Andreas Hasenack (ahasenack)]

+1, cool investigation

review: Approve

[Christian Ehrhardt  (paelzer)]

my checks also pointed out that I forgot u-m, added that as well and waiting to EE to open fully.
Then I'll upload both versions one after the other.

Thanks for the review.

[Christian Ehrhardt  (paelzer)]

Tagged and uploaded

diff --git a/debian/changelog b/debian/changelog
index 1b67953..979aa44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rdma-core (22.1-1ubuntu0.1) disco; urgency=medium
+
+  * d/p/lp-1823836-clear-cmd-buffer.patch: verbs: clear cmd buffer when
+    creating indirection table; fixing MLX device initialization (LP: #1823836)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 23 Apr 2019 09:29:45 +0200
+
 rdma-core (22.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.
diff --git a/debian/patches/lp-1823836-clear-cmd-buffer.patch b/debian/patches/lp-1823836-clear-cmd-buffer.patch
new file mode 100644
index 0000000..b6051f5
--- /dev/null
+++ b/debian/patches/lp-1823836-clear-cmd-buffer.patch
@@ -0,0 +1,38 @@
+From d38817ea554a9fd140e56414a7c74e7eef444c50 Mon Sep 17 00:00:00 2001
+From: Mark Bloch <[e-mail]>
+Date: Wed, 20 Feb 2019 20:00:45 +0000
+Subject: [PATCH] verbs: clear cmd buffer when creating indirection table
+
+[ Upstream commit 34225464c1d165f63ffd462364810cc9f374109d ]
+
+Make sure we clear the cmd buffer, not doing so will make the kernel to
+fail the command.
+
+Fixes: 75c65bbcadcd ("verbs: Consolidate duplicate code in create_rwq_ind_table")
+Signed-off-by: Mark Bloch <[e-mail]>
+Signed-off-by: Yishai Hadas <[e-mail]>
+Signed-off-by: Nicolas Morey-Chaisemartin <[e-mail]>
+
+Origin: upstream, https://github.com/linux-rdma/rdma-core/commit/d38817ea554a9fd140e56414a7c74e7eef444c50
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1823836
+Last-Update: 2019-04-23
+
+---
+ libibverbs/cmd.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libibverbs/cmd.c b/libibverbs/cmd.c
+index 34c71e56..5817c598 100644
+--- a/libibverbs/cmd.c
++++ b/libibverbs/cmd.c
+@@ -1854,6 +1854,7 @@ int ibv_cmd_create_rwq_ind_table(struct ibv_context *context,
+ 	cmd_size = sizeof(*cmd) + num_tbl_entries * sizeof(cmd->wq_handles[0]);
+ 	cmd_size = (cmd_size + 7) / 8 * 8;
+ 	cmd = alloca(cmd_size);
++	memset(cmd, 0, cmd_size);
+ 
+ 	for (i = 0; i < num_tbl_entries; i++)
+ 		cmd->wq_handles[i] = init_attr->ind_tbl[i]->handle;
+-- 
+2.17.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 212c6aa..c2a5fdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 pyverbs-Add-shebang-to-ib_devices.py-example.patch
+lp-1823836-clear-cmd-buffer.patch