Merge ~paelzer/ubuntu/+source/numad:fix-1832915-fix-sparse-numa-ids-disco into ~paelzer/ubuntu/+source/numad:importer/ubuntu/disco-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

SRU version of https://code.launchpad.net/~paelzer/ubuntu/+source/numad/+git/numad/+merge/369036

Since the code didn't change since Bionic -> Eoan all that is new is the versioning.

[Bryce Harrington (bryce)]

- Verified patch matches what was uploaded for eoan
- Verified new versioning is correct
- Verified update-maintainer has been run
- Verified matching patch name is listed in d/p/series

* The SRU paperwork needs filled out at LP: #1832915
* Exact steps to reproduce and/or disco/bionic ppas would be helpful for verification

See bionic for attempt at reproducing the original issue.

[Christian Ehrhardt  (paelzer)]

Added the SRU paperwork, thanks for the hint

[Christian Ehrhardt  (paelzer)]

Thank you for your review and checking all the details Bryce, since I addressed all findings I'll set it to approved now to get this ball rolling.

[Christian Ehrhardt  (paelzer)]

review: Approve

[Christian Ehrhardt  (paelzer)]

This is in universe, hence not in gut-ubuntu. Therefore NOT tagged and pushed;
But uploaded - waiting for SRU review

[Christian Ehrhardt  (paelzer)]

held in proposed, but merged in terms of the archive

diff --git a/debian/changelog b/debian/changelog
index fdbc70a..03d908b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+numad (0.5+20150602-5ubuntu0.19.04.1) disco; urgency=medium
+
+  * d/p/lp-1832915-fix-sparse-node-ids.patch: fix a crash on ppc64el
+    (LP: #1832915)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 19 Jun 2019 13:05:33 +0200
+
 numad (0.5+20150602-5) unstable; urgency=medium
 
   * fix systemd doesn't read /etc/default/numad (Closes: #845447)
diff --git a/debian/control b/debian/control
index a8ad461..f3d7658 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: numad
 Section: admin
 Priority: optional
-Maintainer: Jeremías Casteglione <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jeremías Casteglione <[e-mail]>
 Uploaders: gustavo panizzo <[e-mail]>, Kamal Mostafa <[e-mail]>
 Build-Depends: debhelper (>= 9),dh-systemd (>= 1.5)
 Standards-Version: 3.9.6
diff --git a/debian/patches/lp-1832915-fix-sparse-node-ids.patch b/debian/patches/lp-1832915-fix-sparse-node-ids.patch
new file mode 100644
index 0000000..956edfe
--- /dev/null
+++ b/debian/patches/lp-1832915-fix-sparse-node-ids.patch
@@ -0,0 +1,60 @@
+From ab79ec5b6389507b4970d68862abb95d0b2b94c9 Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <[e-mail]>
+Date: Mon, 17 Jun 2019 12:37:48 +0200
+Subject: [PATCH] fix sparse node ids
+
+CPU-ids can be sparse due to disabling a subset of CPUs.
+On ppc64le this even will make the node_ids sparse, this is actually pretty
+common on ppc64 when SMT is disabled.
+
+Numad has the assumption of cpu/node-ids always being linear and due to that
+accesses the 'node' array out of bounds. That triggers crashes like the
+following:
+
+  Thread 1 "numad" received signal SIGSEGV, Segmentation fault.
+  #0 0x00000fb6cd2779f4 in bind_process_and_migrate_memory (p=0xfb6fc1e0f70)
+    at numad.c:998
+  #1 0x00000fb6cd27d148 in manage_loads () at numad.c:2225
+  #2 0x00000fb6cd2734dc in main (argc=<optimized out>, argv=<optimized out>)
+    at numad.c:2654
+
+Instead of directly indexing with node_id we need to detect which array
+element has the matching node_id and use that.
+
+Forwarded: yes (https://pagure.io/numad/pull-request/3)
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1832915
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=930725
+Last-Update: 2019-06-19
+
+Signed-off-by: Christian Ehrhardt <[e-mail]>
+---
+ numad.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/numad.c b/numad.c
+index a6a7a5d..524bf61 100644
+--- a/numad.c
++++ b/numad.c
+@@ -995,7 +995,18 @@ int bind_process_and_migrate_memory(process_data_p p) {
+     int node_id = 0;
+     while (nodes) {
+         if (ID_IS_IN_LIST(node_id, p->node_list_p)) {
+-            OR_LISTS(cpu_bind_list_p, cpu_bind_list_p, node[node_id].cpu_list_p);
++            int id = -1;
++            for (int node_ix = 0;  (node_ix < num_nodes);  node_ix++) {
++                if (node[node_ix].node_id == node_id) {
++                    id = node_ix;
++                    break;
++                }
++        }
++            if (id == -1) {
++                numad_log(LOG_CRIT, "Node %d is requested, but unknown\n", node_id);
++                exit(EXIT_FAILURE);
++            }
++            OR_LISTS(cpu_bind_list_p, cpu_bind_list_p, node[id].cpu_list_p);
+             nodes -= 1;
+         }
+         node_id += 1;
+-- 
+2.21.0
+
diff --git a/debian/patches/series b/debian/patches/series
index b51a504..9944620 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ makefile-better-cleanup.path
 abd1802c58d40cd99c69a0f3c10041c0c2b1bd55.patch
 fix-build-for-no-NR-migrate-pages.patch
 systemd-read-defaults-file
+lp-1832915-fix-sparse-node-ids.patch