Skip to contentSkip to conversation

ltp: Update to 20190115

PATCH In review Petr Vorel 3 participants 7 messages Jan 15, 2019 – Feb 25, 2019

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH v2 1/1 ltp: Update to 20190115

Updated patches
* 0004-build-Add-option-to-select-libc-implementation.patch
* 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
* 0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch

Removed patches (accepted in upstream)
* 0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
* 0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
* 0001-setrlimit05-Use-another-method-to-get-bad-address.patch
* 0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch
* 0001-statx-fix-compile-errors.patch
* 0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch (accepted v2 version, see http://lists.linux.it/pipermail/ltp/2018-October/009691.html)

---
Changes v1->v2:
* Update SRCREV (previous version used old version)
* Refresh patches

---
 ...getcpu-to-avoid-conflict-with-glibc-.patch |  57 ------
 ...use-ping-6-when-ping6-is-not-avaliab.patch |  45 -----
 ...suite-mmap24-2-Relax-condition-a-bit.patch |   6 +-
 ...se-another-method-to-get-bad-address.patch |  61 ------
 ...-recent-glibc-calls-syscall-directly.patch |  75 -------
 .../ltp/0001-statx-fix-compile-errors.patch   |  35 ----
 ...ake-OFD-command-use-fcntl64-syscall-.patch | 184 ------------------
 ...option-to-select-libc-implementation.patch |   3 +-
 ...BC_PREREQ-is-defined-before-using-it.patch | 124 ------------
 .../ltp/{ltp_20180926.bb => ltp_20190115.bb}  |   8 +-
 10 files changed, 5 insertions(+), 593 deletions(-)
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-setrlimit05-Use-another-method-to-get-bad-address.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch
 rename meta/recipes-extended/ltp/{ltp_20180926.bb => ltp_20190115.bb} (91%)
meta/recipes-extended/ltp/ltp/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch deleted +0 -57
deleted file mode 100644
index d0c847774d..0000000000
@@ -1,57 +0,0 @@
-From c9edb0eaaca83c18ac7b5ea3330faad8d47d3fd1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 14 Dec 2018 06:44:02 -0800
-Subject: [PATCH] getcpu01: Rename getcpu to avoid conflict with glibc >= 2.29
-
-glibc has added getcpu() API starting with glibc 2.29 release, this
-makes the static function in conflict and signatures are not same as
-well.
-
-Renaming helps to keep ltp build going
-
-Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2018-December/010321.html]
-
-Signed-off-by: Khem Raj <[email protected]>
----
- testcases/kernel/syscalls/getcpu/getcpu01.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/getcpu/getcpu01.c b/testcases/kernel/syscalls/getcpu/getcpu01.c
-index c927512ca..e850fe844 100644
---- a/testcases/kernel/syscalls/getcpu/getcpu01.c
-+++ b/testcases/kernel/syscalls/getcpu/getcpu01.c
-@@ -82,7 +82,7 @@ int sys_support = 0;
- 
- void cleanup(void);
- void setup(void);
--static inline int getcpu(unsigned int *, unsigned int *, void *);
-+static inline int get_cpu(unsigned int *, unsigned int *, void *);
- unsigned int set_cpu_affinity(void);
- unsigned int get_nodeid(unsigned int);
- unsigned int max_cpuid(size_t, cpu_set_t *);
-@@ -124,7 +124,7 @@ int main(int ac, char **av)
- #ifdef __i386__
- 		node_set = get_nodeid(cpu_set);
- #endif
--		TEST(getcpu(&cpu_id, &node_id, NULL));
-+		TEST(get_cpu(&cpu_id, &node_id, NULL));
- 		if (TEST_RETURN == 0) {
- 			if (cpu_id != cpu_set) {
- 				tst_resm(TFAIL, "getcpu() returned wrong value"
-@@ -157,10 +157,10 @@ int main(int ac, char **av)
- }
- 
- /*
-- * getcpu() - calls the system call
-+ * get_cpu() - calls the system call
-  */
--static inline int getcpu(unsigned *cpu_id, unsigned *node_id,
--			 void *cache_struct)
-+static inline int get_cpu(unsigned *cpu_id, unsigned *node_id,
-+			  void *cache_struct)
- {
- #if defined(__i386__)
- 	return syscall(318, cpu_id, node_id, cache_struct);
--- 
-2.20.0
-
meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch deleted +0 -45

45 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch +3 -3
index 4d771c0b9c..84736053bf 100644
@@ -43,8 +43,8 @@ index de51d43..810e5c8 100644
 + * 3. Should get ENOMEM or EINVAL.
   */
  
- #define _XOPEN_SOURCE 600
-@@ -93,8 +93,8 @@ int main(void)
+ #include <stdio.h>
+@@ -92,8 +92,8 @@ int main(void)
  	       (unsigned long)len);
  	pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd,
  		  0);
@@ -55,7 +55,7 @@ index de51d43..810e5c8 100644
  		exit(PTS_PASS);
  	}
  
-@@ -103,6 +103,6 @@ int main(void)
+@@ -102,6 +102,6 @@ int main(void)
  	else
  		munmap(pa, len);
  	close(fd);
meta/recipes-extended/ltp/ltp/0001-setrlimit05-Use-another-method-to-get-bad-address.patch deleted +0 -61

61 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch deleted +0 -75

75 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch deleted +0 -35
deleted file mode 100644
index 140bfeb879..0000000000
@@ -1,35 +0,0 @@
-From a945304b6a2286d0665c70250cc5475eb07fd21e Mon Sep 17 00:00:00 2001
-From: Thadeu Lima de Souza Cascardo <[email protected]>
-Date: Wed, 26 Sep 2018 11:15:45 -0300
-Subject: [PATCH] statx: fix compile errors
-
-struct statx is only defined in sys/stat.h when _GNU_SOURCE is defined.
-The testcases do define _GNU_SOURCE, but not the m4 struct check.
-
-Upstream-Status: Backport
-Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>
-Acked-by: Cyril Hrubis <[email protected]>
----
- m4/ltp-statx.m4 | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/m4/ltp-statx.m4 b/m4/ltp-statx.m4
-index 44303d30c..5f79a94cd 100644
---- a/m4/ltp-statx.m4
-+++ b/m4/ltp-statx.m4
-@@ -23,6 +23,11 @@ dnl
- AC_DEFUN([LTP_CHECK_STATX],[
- AC_CHECK_FUNCS(statx,,,[[#include <sys/stat.h>]])
- AC_CHECK_HEADER(linux/fs.h,,,)
--AC_CHECK_TYPES([struct statx],,,[[#include <sys/stat.h>]])
--AC_CHECK_TYPES([struct statx_timestamp],,,[[#include <sys/stat.h>]])
-+AC_CHECK_TYPES([struct statx],,,[[
-+	#define _GNU_SOURCE
-+	#include <sys/stat.h>
-+]])
-+AC_CHECK_TYPES([struct statx_timestamp],,,[[
-+	#define _GNU_SOURCE
-+	#include <sys/stat.h>]])
- ])
---
-2.19.1
meta/recipes-extended/ltp/ltp/0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch deleted +0 -184

184 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch +1 -2
index 2df385591b..bc19531def 100644
@@ -42,7 +42,7 @@ diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile
 index 50a12fa..4f1987f 100644
 --- a/testcases/kernel/Makefile
 +++ b/testcases/kernel/Makefile
-@@ -48,13 +48,16 @@ SUBDIRS			+= connectors \
+@@ -49,12 +49,15 @@
  			   logging \
  			   mem \
  			   numa \
@@ -51,7 +51,6 @@ index 50a12fa..4f1987f 100644
  			   security \
  			   timers \
  			   tracing \
- 			   module \
  
 +ifneq ($(LIBC),musl)
 +SUBDIRS			+= pty
meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +0 -124

136 lines not on this page · raw message

meta/recipes-extended/ltp/ltp_20190115.bb renamed from meta/recipes-extended/ltp/ltp_20180926.bb +1 -7
similarity index 91%
rename from meta/recipes-extended/ltp/ltp_20180926.bb
rename to meta/recipes-extended/ltp/ltp_20190115.bb
index 99e7023b25..892d0a0829 100644
@@ -27,7 +27,7 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer"
 
 CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "f424769b1ad9fca477118763f88a6cec98ea2c0a"
+SRCREV = "a6a5caef13632e669dda27b0461726eba546a2f3"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git \
            file://0004-build-Add-option-to-select-libc-implementation.patch \
@@ -46,13 +46,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
            file://0035-fix-test_proc_kill-hang.patch \
            file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
            file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \
-           file://0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch \
-           file://0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch \
-           file://0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch \
            file://0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
-           file://0001-statx-fix-compile-errors.patch \
-           file://0001-setrlimit05-Use-another-method-to-get-bad-address.patch \
-           file://0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch \
            "
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.19.2
#1 lore raw
Quoted 15 lines · Petr Vorel

Updated patches
* 0004-build-Add-option-to-select-libc-implementation.patch
* 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
* 0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch

Removed patches (accepted in upstream)
* 0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
* 0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
* 0001-setrlimit05-Use-another-method-to-get-bad-address.patch
* 0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch
* 0001-statx-fix-compile-errors.patch
* 0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch (accepted v2 version, see
http://lists.linux.it/pipermail/ltp/2018-October/009691.html)

Quoted 5 lines

---
Changes v1->v2:
* Update SRCREV (previous version used old version)
* Refresh patches

Thanks for looking at this. Unfortunately it failed in testing on most targets:

https://autobuilder.yoctoproject.org/typhoon/#/builders/46/builds/181/steps/7/logs/step1b

(one failure given as an example).

Warnings as errors are good during development but sometimes less useful during release due to the variety of end user configurations.

Cheers,

Richard

#2 lore raw
Quoted 26 lines · Richard Purdie
Quoted 15 lines · Petr Vorel

Updated patches
* 0004-build-Add-option-to-select-libc-implementation.patch
* 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
* 0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch

Removed patches (accepted in upstream)
* 0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
* 0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
* 0001-setrlimit05-Use-another-method-to-get-bad-address.patch
* 0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch
* 0001-statx-fix-compile-errors.patch
* 0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch (accepted v2 version, see
http://lists.linux.it/pipermail/ltp/2018-October/009691.html)

Quoted 5 lines

---
Changes v1->v2:
* Update SRCREV (previous version used old version)
* Refresh patches

Thanks for looking at this. Unfortunately it failed in testing on most targets:

Quoted 7 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/46/builds/181/steps/7/logs/step1b

(one failure given as an example).

Warnings as errors are good during development but sometimes less useful during release due to the variety of end user configurations.

with glibc 2.29 in play
http://errors.yoctoproject.org/Errors/Details/216829/

Quoted 9 lines

Cheers,

Richard

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

author
#3 lore raw

Hi Richard, Khem,

Quoted 5 lines
Quoted 4 lines

Thanks for looking at this. Unfortunately it failed in testing on most targets:

https://autobuilder.yoctoproject.org/typhoon/#/builders/46/builds/181/steps/7/logs/step1b

Quoted 7 lines
Quoted 4 lines

(one failure given as an example).

Warnings as errors are good during development but sometimes less useful during release due to the variety of end user configurations.

with glibc 2.29 in play
http://errors.yoctoproject.org/Errors/Details/216829/

Thanks for your reports.
Is there any way I could easily reproduce it?
Some config I can download?
I'm testing with default config.
I'm sorry for dummy question, I'm more experienced with Buildroot.

Kind regards,
Petr

#4 lore raw
Quoted 10 lines · Petr Vorel

Hi Richard, Khem,

Quoted 8 lines
Quoted 8 lines

Thanks for looking at this. Unfortunately it failed in testing on most
targets:
https://autobuilder.yoctoproject.org/typhoon/#/builders/46/builds/181/steps/7/logs/step1b
(one failure given as an example).
Warnings as errors are good during development but sometimes less useful during release due to the variety of end user configurations.

Quoted 8 lines
Quoted 2 lines

with glibc 2.29 in play
http://errors.yoctoproject.org/Errors/Details/216829/

Thanks for your reports.
Is there any way I could easily reproduce it?
Some config I can download?
I'm testing with default config.
I'm sorry for dummy question, I'm more experienced with Buildroot.

Sorry for not replying sooner. We just hit this issue again:

http://errors.yoctoproject.org/Errors/Latest/?filter=480efd388db578106a8a2129c0382b7e56a1ee36&type=commit&limit=150

This time I think I understand where the error is coming from though:

http://git.yoctoproject.org/cgit.cgi/poky/tree/meta/conf/distro/include/security_flags.inc

does:

security_flags.inc:SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security" security_flags.inc:SECURITY_CFLAGS ?= "${SECURITY_STACK_PROTECTOR} ${SECURITY_PIE_CFLAGS} ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}"

so the reproducer should be to add "-Wformat -Wformat-security -Werror=format-security" to CFLAGS when building ltp.

Cheers,

Richard

#5 lore raw
Quoted 29 lines · Richard Purdie
Quoted 10 lines · Petr Vorel

Hi Richard, Khem,

Quoted 8 lines
Quoted 8 lines

Thanks for looking at this. Unfortunately it failed in testing on most
targets:
https://autobuilder.yoctoproject.org/typhoon/#/builders/46/builds/181/steps/7/logs/step1b
(one failure given as an example).
Warnings as errors are good during development but sometimes less useful during release due to the variety of end user configurations.

Quoted 8 lines
Quoted 2 lines

with glibc 2.29 in play
http://errors.yoctoproject.org/Errors/Details/216829/

Thanks for your reports.
Is there any way I could easily reproduce it?
Some config I can download?
I'm testing with default config.
I'm sorry for dummy question, I'm more experienced with Buildroot.

Sorry for not replying sooner. We just hit this issue again:

http://errors.yoctoproject.org/Errors/Latest/?filter=480efd388db578106a8a2129c0382b7e56a1ee36&type=commit&limit=150

This time I think I understand where the error is coming from though:

http://git.yoctoproject.org/cgit.cgi/poky/tree/meta/conf/distro/include/security_flags.inc

Quoted 8 lines

does:

security_flags.inc:SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security" security_flags.inc:SECURITY_CFLAGS ?= "${SECURITY_STACK_PROTECTOR} ${SECURITY_PIE_CFLAGS} ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}"

so the reproducer should be to add "-Wformat -Wformat-security -Werror=format-security" to CFLAGS when building ltp.

I think this must be new, we are carrying patches to fix similar issues in other parts of ltp. Probably something to consider for upstreaming
e.g.
https://git.openembedded.org/openembedded-core/tree/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch

Quoted 4 lines

Cheers,

Richard

author
#6 lore raw

Hi Richard, Khem,

Quoted 7 lines
Quoted 5 lines

security_flags.inc:SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security" security_flags.inc:SECURITY_CFLAGS ?= "${SECURITY_STACK_PROTECTOR} ${SECURITY_PIE_CFLAGS} ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}"

so the reproducer should be to add "-Wformat -Wformat-security -Werror=format-security" to CFLAGS when building ltp.

Quoted 5 lines

I think this must be new, we are carrying patches to fix similar issues in other parts of ltp. Probably something to consider for upstreaming
e.g.
https://git.openembedded.org/openembedded-core/tree/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch

I was testing it, but this one was ok. Found problems with setregid01.c, to realize that it was already posted to LTP mailing list, so pushed it.

Kind regards,
Petr