From fe75e6efdd3c1d0d89b5732974c92960ae6e0f07 Mon Sep 17 00:00:00 2001 From: Randy MacLeod Date: Mon, 12 Nov 2018 16:14:59 -0500 Subject: stress-ng: Upgrade from 0.09.37 to 0.09.45 Drop the upstreamed patch: 0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch Rebase other patches except for the stress-malloc.c change which has made it upstream: c3a2e662 stress-malloc: use HAVE_MALLOPT check for mallopt glibc function Signed-off-by: Randy MacLeod Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- ...file-force-sync-after-build-in-case-reboo.patch | 21 +++++----- .../0001-Several-changes-to-fix-musl-build.patch | 47 +++++++++------------- ...ss-ng-don-t-enable-TARGET_CLONES-for-musl.patch | 30 -------------- .../recipes-test/stress-ng/stress-ng_0.09.37.bb | 26 ------------ .../recipes-test/stress-ng/stress-ng_0.09.45.bb | 26 ++++++++++++ 5 files changed, 57 insertions(+), 93 deletions(-) delete mode 100644 meta-oe/recipes-test/stress-ng/stress-ng/0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch delete mode 100644 meta-oe/recipes-test/stress-ng/stress-ng_0.09.37.bb create mode 100644 meta-oe/recipes-test/stress-ng/stress-ng_0.09.45.bb diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch index fd2199e535..469791d8e6 100644 --- a/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch +++ b/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch @@ -14,15 +14,18 @@ Signed-off-by: Khem Raj Makefile | 1 - 1 file changed, 1 deletion(-) -Index: stress-ng-0.09.37/Makefile -=================================================================== ---- stress-ng-0.09.37.orig/Makefile -+++ stress-ng-0.09.37/Makefile -@@ -344,7 +344,6 @@ OBJS += $(CONFIG_OBJS) - stress-ng: info $(OBJS) +diff --git a/Makefile b/Makefile +index c0db72c0..5781dda6 100644 +--- a/Makefile ++++ b/Makefile +@@ -348,7 +348,6 @@ endif + stress-ng: $(OBJS) @echo "LD $@" - @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@ + @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@ - @sync - .PHONY: info - info: + makeconfig: + @if [ ! -s config ]; then \ +-- +2.17.0 + diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch index 93d9b544d5..c0b344901e 100644 --- a/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch +++ b/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch @@ -1,11 +1,13 @@ -From d499375fe267be8819ecb985123d89a21edc0e59 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= -Date: Tue, 17 Oct 2017 10:13:20 -0500 +From 9bcb4e170f01dbe0a9e7bf6b899c5d9b5283d4c6 Mon Sep 17 00:00:00 2001 +From: Randy MacLeod +Date: Sun, 11 Nov 2018 23:00:53 -0500 Subject: [PATCH] Several changes to fix musl build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +Rebased patch for: + stress-{context, stackmmap}.c: Set tests to non-implemented because uses swapcontext, musl provide the definition but not the implementation due to that functions are pre-POSIX and set to be deprecated. @@ -19,20 +21,19 @@ cache.c: Define GLOB_ONLYDIR not available on MUSL. Signed-off-by: Aníbal Limón Signed-off-by: Tim Orling +Signed-off-by: Randy MacLeod Upstream-status: Pending - --- cache.c | 4 ++++ stress-madvise.c | 1 + - stress-malloc.c | 2 +- stress-pty.c | 18 ------------------ stress-resources.c | 1 - stress-stackmmap.c | 2 +- - 6 files changed, 7 insertions(+), 21 deletions(-) + 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/cache.c b/cache.c -index fbf7674..936c1ff 100644 +index e8a0f791..4c7bb486 100644 --- a/cache.c +++ b/cache.c @@ -28,6 +28,10 @@ typedef struct { @@ -47,10 +48,10 @@ index fbf7674..936c1ff 100644 #define SYS_CPU_PREFIX "/sys/devices/system/cpu" #define GLOB_PATTERN SYS_CPU_PREFIX "/cpu[0-9]*" diff --git a/stress-madvise.c b/stress-madvise.c -index 9e71e11..ddf8d2d 100644 +index b2e3497f..77e43a91 100644 --- a/stress-madvise.c +++ b/stress-madvise.c -@@ -147,6 +147,7 @@ static int stress_random_advise(const args_t *args) +@@ -146,6 +146,7 @@ static int stress_random_advise(const args_t *args) #if defined(MADV_SOFT_OFFLINE) if (advise == MADV_SOFT_OFFLINE) { static int soft_offline_count; @@ -58,21 +59,8 @@ index 9e71e11..ddf8d2d 100644 /* ..and minimize number of soft offline pages */ if ((soft_offline_count >= NUM_SOFT_OFFLINE_MAX) || -diff --git a/stress-malloc.c b/stress-malloc.c -index a46b8c6..427827a 100644 ---- a/stress-malloc.c -+++ b/stress-malloc.c -@@ -99,7 +99,7 @@ int stress_malloc(const args_t *args) - malloc_max = MIN_MALLOC_MAX; - } - --#if defined(__GNUC__) && defined(__linux__) -+#if defined(__GNUC__) && defined(__linux__) && defined(M_MMAP_THRESHOLD) - if (get_setting("malloc-threshold", &malloc_threshold)) - (void)mallopt(M_MMAP_THRESHOLD, (int)malloc_threshold); - #endif diff --git a/stress-pty.c b/stress-pty.c -index 1bd1fbd..b1fe573 100644 +index 4dd88ab9..c79a7021 100644 --- a/stress-pty.c +++ b/stress-pty.c @@ -26,7 +26,6 @@ @@ -83,7 +71,7 @@ index 1bd1fbd..b1fe573 100644 #include typedef struct { -@@ -108,7 +107,6 @@ int stress_pty(const args_t *args) +@@ -111,7 +110,6 @@ static int stress_pty(const args_t *args) */ for (i = 0; i < n; i++) { struct termios ios; @@ -91,7 +79,7 @@ index 1bd1fbd..b1fe573 100644 struct winsize ws; int arg; -@@ -130,22 +128,6 @@ int stress_pty(const args_t *args) +@@ -133,22 +131,6 @@ static int stress_pty(const args_t *args) if (ioctl(ptys[i].slave, TCSETSF, &ios) < 0) pr_fail_err("ioctl TCSETSF on slave pty"); #endif @@ -115,10 +103,10 @@ index 1bd1fbd..b1fe573 100644 if (ioctl(ptys[i].slave, TIOCGLCKTRMIOS, &ios) < 0) pr_fail_err("ioctl TIOCGLCKTRMIOS on slave pty"); diff --git a/stress-resources.c b/stress-resources.c -index 958c99a..af79abd 100644 +index f3dcfb38..86f9a5ba 100644 --- a/stress-resources.c +++ b/stress-resources.c -@@ -31,7 +31,6 @@ +@@ -28,7 +28,6 @@ #include #endif #if defined(__linux__) @@ -127,7 +115,7 @@ index 958c99a..af79abd 100644 #endif #if defined(HAVE_LIB_PTHREAD) && defined(__linux__) diff --git a/stress-stackmmap.c b/stress-stackmmap.c -index 9c83a69..2984f09 100644 +index c2f4c31d..54308777 100644 --- a/stress-stackmmap.c +++ b/stress-stackmmap.c @@ -24,7 +24,7 @@ @@ -139,3 +127,6 @@ index 9c83a69..2984f09 100644 #include +-- +2.17.0 + diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch deleted file mode 100644 index cd9131df50..0000000000 --- a/meta-oe/recipes-test/stress-ng/stress-ng/0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 59f5ff72768f228cd530bb18a5fc3e8c4772857a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 20 Aug 2018 21:43:14 -0700 -Subject: [PATCH] stress-ng: don't enable TARGET_CLONES for musl - -musl does not support gnu ifuncs - -Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/27] - -Signed-off-by: Khem Raj ---- - stress-ng.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/stress-ng.h b/stress-ng.h -index b9359a4..f228808 100644 ---- a/stress-ng.h -+++ b/stress-ng.h -@@ -1090,7 +1090,7 @@ extern void pr_fail_dbg__(const args_t *args, const char *msg); - #endif - - /* GCC5.0+ target_clones attribute */ --#if defined(__GNUC__) && NEED_GNUC(5,5,0) && STRESS_X86 && \ -+#if defined(__GNUC__) && defined(__GLIBC__) && NEED_GNUC(5,5,0) && STRESS_X86 && \ - !defined(__gnu_hurd__) && !defined(__FreeBSD_Kernel__) - #define TARGET_CLONES __attribute__((target_clones("sse","sse2","ssse3", "sse4.1", "sse4a", "avx","avx2","default"))) - #else --- -2.18.0 - diff --git a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.37.bb b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.37.bb deleted file mode 100644 index a6c327e38e..0000000000 --- a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.37.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "A tool to load and stress a computer system" -HOMEPAGE = "http://kernel.ubuntu.com/~cking/stress-ng/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "zlib libaio" - -SRC_URI = "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ - file://0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch \ - file://0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch \ - " -SRC_URI_append_libc-musl = " \ - file://0001-Several-changes-to-fix-musl-build.patch \ - " -SRC_URI[md5sum] = "81d73313ea7778f749470b6f950553af" -SRC_URI[sha256sum] = "8494afb2f2e2cf7e79ec9c6c3129308b098e530141ba2b07d6547708fd63af3d" - -UPSTREAM_CHECK_URI ?= "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/" -UPSTREAM_CHECK_REGEX ?= "(?P\d+(\.\d+)+)\.tar" - -CFLAGS += "-Wall -Wextra -DVERSION='"$(VERSION)"'" - -do_install_append() { - install -d ${D}${bindir} - install -m 755 ${S}/stress-ng ${D}${bindir}/stress-ng -} diff --git a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.45.bb b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.45.bb new file mode 100644 index 0000000000..3e8f2d4f51 --- /dev/null +++ b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.45.bb @@ -0,0 +1,26 @@ +SUMMARY = "A tool to load and stress a computer system" +HOMEPAGE = "http://kernel.ubuntu.com/~cking/stress-ng/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "zlib libaio" + +SRC_URI = "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ + file://0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch \ + " +SRC_URI_append_libc-musl = " \ + file://0001-Several-changes-to-fix-musl-build.patch \ + " + +SRC_URI[md5sum] = "b03744c2eb68bf7e9a300e78e397f348" +SRC_URI[sha256sum] = "0741e3004bf590bb7af3db979a46fe89bee7aaad6065cd1d87d0b7fa49046cb2" + +UPSTREAM_CHECK_URI ?= "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/" +UPSTREAM_CHECK_REGEX ?= "(?P\d+(\.\d+)+)\.tar" + +CFLAGS += "-Wall -Wextra -DVERSION='"$(VERSION)"'" + +do_install_append() { + install -d ${D}${bindir} + install -m 755 ${S}/stress-ng ${D}${bindir}/stress-ng +} -- cgit v1.2.3-54-g00ecf