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

Proposed by Christian Ehrhardt  on 2019-08-08
Status: Merged
Merged at revision: c45be57fe105bffd5cb0aee80a53341e4ecf8390
Proposed branch: ~paelzer/ubuntu/+source/rdma-core:bug-1838939-azure-mlx4-device
Merge into: ubuntu/+source/rdma-core:ubuntu/bionic-devel
Diff against target: 65 lines (+45/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/series (+1/-0)
debian/patches/ubuntu/lp-1838939-Add-Microsoft-Azure-RDMA-device-to-MLX4-HCA-table.patch (+37/-0)
Reviewer Review Type Date Requested Status
Andreas Hasenack 2019-08-08 Approve on 2019-08-09
Canonical Server Team 2019-08-08 Pending
Ubuntu Server Dev import team 2019-08-08 Pending
Review via email: mp+371072@code.launchpad.net
To post a comment you must log in.
Christian Ehrhardt  (paelzer) wrote :

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) wrote :

- 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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index fae20c4..03e6dd2 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+rdma-core (17.1-1ubuntu0.2) bionic; urgency=medium
7+
8+ * d/p/u/lp-1838939-Add-Microsoft-Azure-RDMA-device-to-MLX4-HCA-table.patch:
9+ Detect Azure RDMA devices as MLX4 (LP: #1838939)
10+
11+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 05 Aug 2019 08:57:39 +0200
12+
13 rdma-core (17.1-1ubuntu0.1) bionic; urgency=medium
14
15 * Drop to avoid issues with the sysV to systemd wrapper starting the service
16diff --git a/debian/patches/series b/debian/patches/series
17new file mode 100644
18index 0000000..d8152a2
19--- /dev/null
20+++ b/debian/patches/series
21@@ -0,0 +1 @@
22+ubuntu/lp-1838939-Add-Microsoft-Azure-RDMA-device-to-MLX4-HCA-table.patch
23diff --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
24new file mode 100644
25index 0000000..9852f13
26--- /dev/null
27+++ b/debian/patches/ubuntu/lp-1838939-Add-Microsoft-Azure-RDMA-device-to-MLX4-HCA-table.patch
28@@ -0,0 +1,37 @@
29+From b98397f3068a42e7d8e67d4ef2a90393b4c4f08a Mon Sep 17 00:00:00 2001
30+From: Long Li <longli@microsoft.com>
31+Date: Wed, 15 Aug 2018 19:28:20 +0000
32+Subject: [PATCH] Add Microsoft Azure RDMA device to MLX4 HCA table
33+
34+Microsoft Azure supports Mellanox MLX4 RDMA devices in HPC VM SKUs. The device
35+is virtualized and exposed over VMBUS, and registered as a MLX4 Infininband
36+hardware in RDMA layer.
37+
38+This devcie is on VMBUS, not on PCI tree. Add it to the HCA table so it can
39+be properly discovered by user-mode driver.
40+
41+Signed-off-by: Long Li <longli@microsoft.com>
42+
43+Origin: upstream, https://github.com/linux-rdma/rdma-core/commit/b98397f3068a42e7d8e67d4ef2a90393b4c4f08a
44+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1838939
45+Last-Update: 2019-08-05
46+
47+---
48+ providers/mlx4/mlx4.c | 1 +
49+ 1 file changed, 1 insertion(+)
50+
51+diff --git a/providers/mlx4/mlx4.c b/providers/mlx4/mlx4.c
52+index 1e418dc1..a0d35052 100644
53+--- a/providers/mlx4/mlx4.c
54++++ b/providers/mlx4/mlx4.c
55+@@ -76,6 +76,7 @@ static const struct verbs_match_ent hca_table[] = {
56+ HCA(MELLANOX, 0x100e), /* MT27551 Family */
57+ HCA(MELLANOX, 0x100f), /* MT27560 Family */
58+ HCA(MELLANOX, 0x1010), /* MT27561 Family */
59++ VERBS_MODALIAS_MATCH("vmbus:3daf2e8ca732094bab99bd1f1c86b501", NULL), /* Microsoft Azure Network Direct */
60+ {}
61+ };
62+
63+--
64+2.22.0
65+

Subscribers

People subscribed via source and target branches