Merge ~paelzer/ubuntu/+source/numactl:lp1817258-bionic into ubuntu/+source/numactl:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Robie Basak (racb)]

lgtm with one minor comment inline.

review: Approve

[Christian Ehrhardt  (paelzer)]

It was modified to their former upstreaming in the last bug - adapted the patch headers thanks!

[Christian Ehrhardt  (paelzer)]

Fixed tagged and pushed

diff --git a/debian/changelog b/debian/changelog
index dd0f2e1..0deec3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+numactl (2.0.11-2.1ubuntu0.1) bionic; urgency=medium
+
+  * d/p/lp1817258-Segment-fault-when-numa-nodes-not-sequential-or-cont.patch:
+    fix segfault on uncommon numa node setups (LP: #1817258)
+  * debian/patches/Allow-building-on-ARM-systems.patch:
+    - add __arm__ to avoid failure due to missing syscalls.
+    - return -1 and set errno to ENOSYS on migrate_pages function
+      if __NR_migrate_pages is undefined, thanks Uwe Kleine-König
+      and Tiago Stürmer Daitx (LP: #1711478).
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 20 Jun 2018 16:36:20 +0200
+
 numactl (2.0.11-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/Allow-building-on-ARM-systems.patch b/debian/patches/Allow-building-on-ARM-systems.patch
new file mode 100644
index 0000000..c606113
--- /dev/null
+++ b/debian/patches/Allow-building-on-ARM-systems.patch
@@ -0,0 +1,47 @@
+Description: Allow building on ARM systems
+ While 32-bit ARM systems do not support NUMA, it is useful to be able
+ to build libnuma for these systems. Distributions would then not need to
+ special case ARM builds for software that uses libnuma when available.
+ libnuma's API requires users to check for NUMA support at runtime using
+ numa_available() which will just always return -1 on ARM.
+ .
+ numactl build fails on arm because arm does not define __NR_migrate_pages.
+ In order to build it on arm the arch must be added to the syscalls check
+ and the migrate_pages must return with -1 and set errno to ENOSYS.
+Origin: upstream, https://github.com/numactl/numactl/commit/e13c9a8417360b16a586226f3b80db0d0aebc248
+Author: Uwe Kleine-König <[e-mail]>
+Author: Tiago Stürmer Daitx <[e-mail]>
+Author: dann frazier <[e-mail]>
+Bug-Debian: https://bugs.debian.org/796802
+Bug-Ubuntu: https://launchpad.net/bugs/1711478
+Last-Update: 2018-04-17
+
+--- a/syscall.c
++++ b/syscall.c
+@@ -109,6 +109,10 @@
+ 
+ #define __NR_migrate_pages	272
+ 
++#elif defined(__arm__)
++/* https://bugs.debian.org/796802 */
++#warning "ARM does not implement the migrate_pages() syscall"
++
+ #elif !defined(DEPS_RUN)
+ #error "Add syscalls for your architecture or update kernel headers"
+ #endif
+@@ -211,7 +215,12 @@ long WEAK set_mempolicy(int mode, const unsigned long *nmask,
+ long WEAK migrate_pages(int pid, unsigned long maxnode,
+ 	const unsigned long *frommask, const unsigned long *tomask)
+ {
++#if defined(__NR_migrate_pages)
+ 	return syscall(__NR_migrate_pages, pid, maxnode, frommask, tomask);
++#else
++    errno = ENOSYS;
++    return -1;
++#endif
+ }
+ 
+ long WEAK move_pages(int pid, unsigned long count,
+-- 
+2.17.0
+
diff --git a/debian/patches/lp1817258-Segment-fault-when-numa-nodes-not-sequential-or-cont.patch b/debian/patches/lp1817258-Segment-fault-when-numa-nodes-not-sequential-or-cont.patch
new file mode 100644
index 0000000..1f68a7b
--- /dev/null
+++ b/debian/patches/lp1817258-Segment-fault-when-numa-nodes-not-sequential-or-cont.patch
@@ -0,0 +1,136 @@
+From b608687037d873ad82d6318f231b3d6612e8601d Mon Sep 17 00:00:00 2001
+From: Seeteena Thoufeek <[e-mail]>
+Date: Wed, 21 Dec 2016 12:48:11 +0530
+Subject: [PATCH] Segment fault when numa nodes not sequential or contiguous
+
+While trying to get stat of the guest process (configured with hugepages), numastat fails
+
+====================
+Environment details
+====================
+Linux lep8b 4.8.0-30-generic #32-Ubuntu SMP Fri Dec 2 03:43:46 UTC 2016 ppc64le ppc64le ppc64le GNU/Linu
+
+=====
+Issue
+=====
[phone]:02:56,396 process          L0368 INFO | Running 'numastat 61257'
[phone]:02:56,402 process          L0462 DEBUG| [stderr] *** Error in `numastat': double free or corruption (out): 0x00000100265005a0 ***
[phone]:02:56,403 process          L0462 DEBUG| [stdout]
[phone]:02:56,403 process          L0482 INFO | Command 'numastat 61257' finished with -6 after 0.00309896469116s
[phone]:02:56,403 process          L0462 DEBUG| [stdout] Per-node process memory usage (in MBs) for PID 61257 (qemu-system-ppc)
[phone]:02:56,404 process          L0462 DEBUG| [stderr] ======= Backtrace: =========
[phone]:02:56,404 process          L0462 DEBUG| [stderr] /lib/powerpc64le-linux-gnu/libc.so.6(+0x86d54)[0x3fff9a736d54]
[phone]:02:56,404 process          L0462 DEBUG| [stderr] /lib/powerpc64le-linux-gnu/libc.so.6(+0x93c30)[0x3fff9a743c30]
[phone]:02:56,404 process          L0462 DEBUG| [stderr] /lib/powerpc64le-linux-gnu/libc.so.6(cfree+0x68)[0x3fff9a748218]
[phone]:02:56,405 process          L0462 DEBUG| [stderr] /lib/powerpc64le-linux-gnu/libc.so.6(fclose+0x1c8)[0x3fff9a727d68]
[phone]:02:56,405 process          L0462 DEBUG| [stderr] numastat(+0x7aa4)[0x401d7aa4]
[phone]:02:56,405 process          L0462 DEBUG| [stderr] numastat(+0x2388)[0x401d2388]
[phone]:02:56,405 process          L0462 DEBUG| [stderr] /lib/powerpc64le-linux-gnu/libc.so.6(+0x2291c)[0x3fff9a6d291c]
[phone]:02:56,405 process          L0462 DEBUG| [stderr] /lib/powerpc64le-linux-gnu/libc.so.6(__libc_start_main+0xb8)[0x3fff9a6d2b18]
[phone]:02:56,405 process          L0462 DEBUG| [stderr] ======= Memory map: ========
[phone]:02:56,405 process          L0462 DEBUG| [stderr] 401d0000-401e0000 r-xp 00000000 08:92 40325510                           /usr/bin/numastat
[phone]:02:56,405 process          L0462 DEBUG| [stderr] 401e0000-401f0000 r--p 00000000 08:92 40325510                           /usr/bin/numastat
[phone]:02:56,406 process          L0462 DEBUG| [stderr] 401f0000-40200000 rw-p 00010000 08:92 40325510                           /usr/bin/numastat
[phone]:02:56,406 process          L0462 DEBUG| [stderr] 10026500000-10026530000 rw-p 00000000 00:00 0                            [heap]
[phone]:02:56,406 process          L0462 DEBUG| [stderr] 3fff9a6b0000-3fff9a860000 r-xp 00000000 08:92 25745199                   /lib/powerpc64le-linux-gnu/libc-2.24.so
[phone]:02:56,406 process          L0462 DEBUG| [stderr] 3fff9a860000-3fff9a870000 ---p 001b0000 08:92 25745199                   /lib/powerpc64le-linux-gnu/libc-2.24.so
[phone]:02:56,406 process          L0462 DEBUG| [stderr] 3fff9a870000-3fff9a880000 r--p 001b0000 08:92 25745199                   /lib/powerpc64le-linux-gnu/libc-2.24.so
[phone]:02:56,406 process          L0462 DEBUG| [stderr] 3fff9a880000-3fff9a890000 rw-p 001c0000 08:92 25745199                   /lib/powerpc64le-linux-gnu/libc-2.24.so
[phone]:02:56,406 process          L0462 DEBUG| [stderr] 3fff9a8b0000-3fff9a8c0000 rw-p 00000000 00:00 0
[phone]:02:56,407 process          L0462 DEBUG| [stderr] 3fff9a8c0000-3fff9a8e0000 r-xp 00000000 00:00 0                          [vdso]
[phone]:02:56,407 process          L0462 DEBUG| [stderr] 3fff9a8e0000-3fff9a920000 r-xp 00000000 08:92 25745195                   /lib/powerpc64le-linux-gnu/ld-2.24.so
[phone]:02:56,407 process          L0462 DEBUG| [stderr] 3fff9a920000-3fff9a930000 r--p 00030000 08:92 25745195                   /lib/powerpc64le-linux-gnu/ld-2.24.so
[phone]:02:56,407 process          L0462 DEBUG| [stderr] 3fff9a930000-3fff9a940000 rw-p 00040000 08:92 25745195                   /lib/powerpc64le-linux-gnu/ld-2.24.so
[phone]:02:56,407 process          L0462 DEBUG| [stderr] 3fffdd320000-3fffdd350000 rw-p 00000000 00:00 0                          [stack]
+
+=============
+Recreation Steps
+=============
+1. Configure host with hugepages
+2. Start a guest and attach following memory device xml,
+<?xml version='1.0' encoding='UTF-8'?>
+<memory model="dimm"><target><size unit="KiB">8388608</size><node>0</node></target><source><pagesize unit="KiB">16384</pagesize><nodemask>0</nodemask></source></memory>
+3. Set the rules in guest
+4. execute numastat of guest pid
+
+Expected Result :
+Provide PID numastat
+
+Per-node process memory usage (in MBs) for PID 55119 (qemu-system-ppc)
+Node 0          Node 1         Node 16
+--------------- --------------- ---------------
+Huge                         0.00            0.00            0.00
+Heap                         2.00            0.38            0.00
+Stack                        0.00            0.00            0.00
+Private                  31800.12          183.06            0.00
+----------------  --------------- --------------- ---------------
+Total                    31802.12          183.44            0.00
+
+Node 17           Total
+--------------- ---------------
+Huge                         0.00            0.00
+Heap                         0.00           15.25
+Stack                        0.00            0.06
+Private                      0.00        33169.31
+----------------  --------------- ---------------
+Total                        0.00        34345.00
+*** Error in `numastat': free(): invalid next size (fast): 0x000001003f2c0580 ***
+======= Backtrace: =========
+/lib/powerpc64le-linux-gnu/libc.so.6(+0x86d54)[0x3fff82866d54]
+/lib/powerpc64le-linux-gnu/libc.so.6(+0x93c30)[0x3fff82873c30]
+/lib/powerpc64le-linux-gnu/libc.so.6(cfree+0x68)[0x3fff82878218]
+numastat(+0x4244)[0x5adc4244]
+numastat(+0x7d24)[0x5adc7d24]
+numastat(+0x2388)[0x5adc2388]
+/lib/powerpc64le-linux-gnu/libc.so.6(+0x2291c)[0x3fff8280291c]
+/lib/powerpc64le-linux-gnu/libc.so.6(__libc_start_main+0xb8)[0x3fff82802b18]
+======= Memory map: ========
+5adc0000-5add0000 r-xp 00000000 08:92 40325510                           /usr/bin/numastat
+5add0000-5ade0000 r--p 00000000 08:92 40325510                           /usr/bin/numastat
+5ade0000-5adf0000 rw-p 00010000 08:92 40325510                           /usr/bin/numastat
+1003f2c0000-1003f2f0000 rw-p 00000000 00:00 0                            [heap]
+3fff827e0000-3fff82990000 r-xp 00000000 08:92 25745199                   /lib/powerpc64le-linux-gnu/libc-2.24.so
+3fff82990000-3fff829a0000 ---p 001b0000 08:92 25745199                   /lib/powerpc64le-linux-gnu/libc-2.24.so
+3fff829a0000-3fff829b0000 r--p 001b0000 08:92 25745199                   /lib/powerpc64le-linux-gnu/libc-2.24.so
+3fff829b0000-3fff829c0000 rw-p 001c0000 08:92 25745199                   /lib/powerpc64le-linux-gnu/libc-2.24.so
+3fff829e0000-3fff829f0000 rw-p 00000000 00:00 0
+3fff829f0000-3fff82a10000 r-xp 00000000 00:00 0                          [vdso]
+3fff82a10000-3fff82a50000 r-xp 00000000 08:92 25745195                   /lib/powerpc64le-linux-gnu/ld-2.24.so
+3fff82a50000-3fff82a60000 r--p 00030000 08:92 25745195                   /lib/powerpc64le-linux-gnu/ld-2.24.so
+3fff82a60000-3fff82a70000 rw-p 00040000 08:92 25745195                   /lib/powerpc64le-linux-gnu/ld-2.24.so
+3fffc3b90000-3fffc3bc0000 rw-p 00000000 00:00 0                          [stack]
+Aborted
+
+Signed-off-by: Seeteena Thoufeek <[e-mail]>
+Signed-off-by: Andi Kleen <[e-mail]>
+
+Author: Christian Ehrhardt <[e-mail]>
+Original-Author: Seeteena Thoufeek <[e-mail]>
+Origin: backport, https://github.com/numactl/numactl/commit/b608687037d873ad82d6318f231b3d6612e8601d
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1817258
+Last-Update: 2019-02-28
+---
+ numastat.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/numastat.c b/numastat.c
+index 1924dba..e0a5639 100644
+--- a/numastat.c
++++ b/numastat.c
+@@ -1054,7 +1054,12 @@ void show_process_info() {
+ 					} else {
+ 						tmp_row = header_rows + pid_ix;
+ 					}
+-					int tmp_col = header_cols + node_num;
++					// Don't assume nodes are sequential or contiguous.
++					// Need to find correct tmp_col from node_ix_map
++					int i = 0;
++					while(node_ix_map[i++] != node_num)
++						;
++					int tmp_col = header_cols + i - 1;
+ 					double_addto(&table, tmp_row, tmp_col, value);
+ 					double_addto(&table, tmp_row, total_col_ix, value);
+ 					double_addto(&table, total_row_ix, tmp_col, value);
+-- 
+2.17.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..20fa623
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+Allow-building-on-ARM-systems.patch
+lp1817258-Segment-fault-when-numa-nodes-not-sequential-or-cont.patch