Merge ~paelzer/ubuntu/+source/rdma-core:bug-1838939-azure-mlx4-device into ubuntu/+source/rdma-core:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA is available at [1], but we still wait for test steps and/or an actual test by Microsoft on the bug.

This should be a straight forward fix, but you never know - so a review would be great.

[1]: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1838939-rdma-azure-mlx4

[Andreas Hasenack (ahasenack)]

- patch matches upstream commit
- d/changelog and version ok
- patched code present in eoan, disco. Not cosmic (EOL) and not bionic (this MP). Package doesn't exist before.

+1

review: Approve

diff --git a/debian/changelog b/debian/changelog
index fae20c4..03e6dd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rdma-core (17.1-1ubuntu0.2) bionic; urgency=medium
+
+  * d/p/u/lp-1838939-Add-Microsoft-Azure-RDMA-device-to-MLX4-HCA-table.patch:
+    Detect Azure RDMA devices as MLX4 (LP: #1838939)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 05 Aug 2019 08:57:39 +0200
+
 rdma-core (17.1-1ubuntu0.1) bionic; urgency=medium
 
   * Drop to avoid issues with the sysV to systemd wrapper starting the service
diff --git a/debian/patches/series b/debian/patches/series
 new file mode 100644
index 0000000..d8152a2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ubuntu/lp-1838939-Add-Microsoft-Azure-RDMA-device-to-MLX4-HCA-table.patch
diff --git a/debian/patches/ubuntu/lp-1838939-Add-Microsoft-Azure-RDMA-device-to-MLX4-HCA-table.patch b/debian/patches/ubuntu/lp-1838939-Add-Microsoft-Azure-RDMA-device-to-MLX4-HCA-table.patch
 new file mode 100644
index 0000000..9852f13
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1838939-Add-Microsoft-Azure-RDMA-device-to-MLX4-HCA-table.patch
@@ -0,0 +1,37 @@
+From b98397f3068a42e7d8e67d4ef2a90393b4c4f08a Mon Sep 17 00:00:00 2001
+From: Long Li <[e-mail]>
+Date: Wed, 15 Aug 2018 19:28:20 +0000
+Subject: [PATCH] Add Microsoft Azure RDMA device to MLX4 HCA table
+
+Microsoft Azure supports Mellanox MLX4 RDMA devices in HPC VM SKUs. The device
+is virtualized and exposed over VMBUS, and registered as a MLX4 Infininband
+hardware in RDMA layer.
+
+This devcie is on VMBUS, not on PCI tree. Add it to the HCA table so it can
+be properly discovered by user-mode driver.
+
+Signed-off-by: Long Li <[e-mail]>
+
+Origin: upstream, https://github.com/linux-rdma/rdma-core/commit/b98397f3068a42e7d8e67d4ef2a90393b4c4f08a
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1838939
+Last-Update: 2019-08-05
+
+---
+ providers/mlx4/mlx4.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/providers/mlx4/mlx4.c b/providers/mlx4/mlx4.c
+index 1e418dc1..a0d35052 100644
+--- a/providers/mlx4/mlx4.c
++++ b/providers/mlx4/mlx4.c
+@@ -76,6 +76,7 @@ static const struct verbs_match_ent hca_table[] = {
+ 	HCA(MELLANOX, 0x100e),	/* MT27551 Family */
+ 	HCA(MELLANOX, 0x100f),	/* MT27560 Family */
+ 	HCA(MELLANOX, 0x1010),	/* MT27561 Family */
++	VERBS_MODALIAS_MATCH("vmbus:3daf2e8ca732094bab99bd1f1c86b501", NULL), /* Microsoft Azure Network Direct */
+ 	{}
+ };
+ 
+-- 
+2.22.0
+