valgrind: update 3.16.1 -> 3.17.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v3 1/2 valgrind: update 3.16.1 -> 3.17.0
Notable changes:
* library is now in libexecdir instead of libdir
Added patches:
* Add musl.supp: missing musl.supp in 3.17.0
Dropped backport patches:
* nlcontrolc: found in c79180a3afcf65902e578646c3b716cc749db406
* drd Fedora33: found in 15330adf7c2471fbaa6a0818db07078d81dbff97
* lmw lswi ppc64le: found in 74b74174d572fee4015b8f4e326db3cd949bcdc3
Other dropped patches
* helgrind intercept: found in d2d54dbcc74244adfc0c80b40862edf2b82f53b9
* drd musl fix: found in d2d54dbcc74244adfc0c80b40862edf2b82f53b9
TESTING RESULTS:
qemux86-64:
FAIL: drd/tests/swapcontext
3.17.0 3.16.1 =================== TOTAL: 736 726 PASSED: 694 688 FAILED: 1 0 SKIPPED: 41 38
---
Changes for V2:
minor edit to commit msg
fix reproducibility
+ # point the expanded @abs_top_builddir@ of the host to PTEST_PATH
+ sed -i s:${S}:${PTEST_PATH}:g \
+ ${D}${PTEST_PATH}/memcheck/tests/linux/debuginfod-check.vgtest
.../valgrind/0001-Add-missing-musl.supp.patch | 72 +++++++
...gtest-hanging-on-newer-glibc-and-or-.patch | 200 ------------------
.../valgrind/0001-drd-Port-to-Fedora-33.patch | 48 -----
.../valgrind/valgrind/0001-drd-musl-fix.patch | 31 ---
...01-helgrind-Intercept-libc-functions.patch | 54 -----
...ated-PowerPC-insns-aren-t-allowed-on.patch | 62 ------
...eak_cmsg.stderr.exp-adjust-tmp-paths.patch | 2 +-
...ntext-APIs-are-not-available-on-musl.patch | 50 ++++-
.../valgrind/valgrind/fixed-perl-path.patch | 20 +-
.../valgrind/valgrind/run-ptest | 3 +-
.../valgrind/valgrind/s390x_vec_op_t.patch | 24 ++-
...{valgrind_3.16.1.bb => valgrind_3.17.0.bb} | 25 ++-
12 files changed, 165 insertions(+), 426 deletions(-)
create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-Add-missing-musl.supp.patch
delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-Fix-nlcontrolc.vgtest-hanging-on-newer-glibc-and-or-.patch
delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-drd-Port-to-Fedora-33.patch
delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-drd-musl-fix.patch
delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-helgrind-Intercept-libc-functions.patch
delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-lmw-lswi-and-related-PowerPC-insns-aren-t-allowed-on.patch
rename meta/recipes-devtools/valgrind/{valgrind_3.16.1.bb => valgrind_3.17.0.bb} (92%)meta/recipes-devtools/valgrind/valgrind/0001-Add-missing-musl.supp.patch new file +72 -0
@@ -0,0 +1,72 @@ +From 61bc8664f93cd980831c9da4a3e8a385b089a0ab Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <[email protected]> +Date: Tue, 23 Mar 2021 09:32:22 -0700 +Subject: [PATCH] Add missing musl.supp + +3.17 did not ship musl.supp in the tarball. + +This is a workaround until next release. + +Upstream-Status: Backport [dde556d51f8226a6de564a00bf82536bb7042c54] + +Signed-off-by: Yi Fan Yu <[email protected]> +--- + musl.supp | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + create mode 100644 musl.supp + +diff --git a/musl.supp b/musl.supp +new file mode 100644 +index 000000000..864172a24 +--- /dev/null ++++ b/musl.supp +@@ -0,0 +1,46 @@ ++# Suppressions for musl libc ++# See: https://www.openwall.com/lists/musl/2017/06/15/4 ++ ++{ ++ musl-dynlink-false-positive1 ++ Memcheck:Leak ++ fun:calloc ++ fun:load_direct_deps ++ fun:load_deps ++ fun:load_deps ++ fun:__dls3 ++ fun:__dls2b ++ fun:__dls2 ++} ++ ++{ ++ musl-dynlink-false-positive2 ++ Memcheck:Leak ++ fun:calloc ++ fun:load_direct_deps ++ fun:load_deps ++ fun:load_deps ++ fun:__dls3 ++ fun:__dls2 ++} ++ ++{ ++ musl-dynlink-false-positive3 ++ Memcheck:Leak ++ fun:calloc ++ fun:load_library ++ fun:load_preload ++ fun:__dls3 ++ fun:__dls2b ++ fun:__dls2 ++} ++ ++{ ++ musl-dynlink-false-positive4 ++ Memcheck:Leak ++ fun:calloc ++ fun:load_library ++ fun:load_preload ++ fun:__dls3 ++ fun:__dls2 ++} +-- +2.17.1 +
meta/recipes-devtools/valgrind/valgrind/0001-Fix-nlcontrolc.vgtest-hanging-on-newer-glibc-and-or-.patch deleted +0 -200
200 lines not on this page · raw message
meta/recipes-devtools/valgrind/valgrind/0001-drd-Port-to-Fedora-33.patch deleted +0 -48
48 lines not on this page · raw message
meta/recipes-devtools/valgrind/valgrind/0001-drd-musl-fix.patch deleted +0 -31
@@ -1,31 +0,0 @@ -The changes in 0001-drd-Port-to-Fedora-33.patch break builds on musl. These -need a __GLIBC__ guard to ensure musl builds continue to work. - -Upstream-Status: Pending -Signed-off-by: Richard Purdie <[email protected]> - -Index: valgrind-3.16.1/drd/drd_pthread_intercepts.c -=================================================================== ---- valgrind-3.16.1.orig/drd/drd_pthread_intercepts.c -+++ valgrind-3.16.1/drd/drd_pthread_intercepts.c -@@ -180,6 +180,7 @@ static int never_true; - * functions in both libc and libpthread. Older glibc versions only have an - * implementation of the pthread functions in libpthread. - */ -+#ifdef __GLIBC__ - #define PTH_FUNC(ret_ty, zf, implf, argl_decl, argl) \ - ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBC_SONAME,zf) argl_decl; \ - ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBC_SONAME,zf) argl_decl \ -@@ -187,6 +188,12 @@ static int never_true; - ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl; \ - ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl \ - { return implf argl; } -+#else -+#define PTH_FUNC(ret_ty, zf, implf, argl_decl, argl) \ -+ ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl; \ -+ ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl \ -+ { return implf argl; } -+#endif - #endif - - /**
meta/recipes-devtools/valgrind/valgrind/0001-helgrind-Intercept-libc-functions.patch deleted +0 -54
54 lines not on this page · raw message
meta/recipes-devtools/valgrind/valgrind/0001-lmw-lswi-and-related-PowerPC-insns-aren-t-allowed-on.patch deleted +0 -62
62 lines not on this page · raw message
meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch +1 -1
@@ -19,7 +19,7 @@ index 6e5a797b9..0ede1ab18 100644 @@ -25,10 +25,10 @@ Open file descriptor ...: /dev/null - FILE DESCRIPTORS: 6 open at exit. + FILE DESCRIPTORS: 6 open (3 std) at exit. -Open file descriptor ...: /tmp/data2 +Open file descriptor ...: ... ...
meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch +45 -5
68 lines not on this page · raw message
meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch +11 -9
@@ -1,4 +1,4 @@ -From 67e7a690107efb16d6d5aebfe420b64a552accdf Mon Sep 17 00:00:00 2001 +From d85cc45e0ddeda68adf594dead715964cb32d0e7 Mon Sep 17 00:00:00 2001 From: Qing He <[email protected]> Date: Tue, 31 Aug 2010 22:51:58 +0800 Subject: [PATCH] valgrind: fix perl scripts
@@ -22,10 +22,11 @@ Signed-off-by: Maxin B. John <[email protected]> cachegrind/cg_diff.in | 2 +- massif/ms_print.in | 2 +- perf/vg_perf.in | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + tests/vg_regtest.in | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in -index 69365e8..978265d 100644 +index fea114b..5e814fd 100644 --- a/cachegrind/cg_annotate.in +++ b/cachegrind/cg_annotate.in @@ -1,4 +1,4 @@
@@ -35,7 +36,7 @@ index 69365e8..978265d 100644 ##--------------------------------------------------------------------## ##--- Cachegrind's annotator. cg_annotate.in ---## diff --git a/cachegrind/cg_diff.in b/cachegrind/cg_diff.in -index 395460b..05873cc 100755 +index 9d9258e..d0f0ec7 100755 --- a/cachegrind/cg_diff.in +++ b/cachegrind/cg_diff.in @@ -1,4 +1,4 @@
@@ -45,7 +46,7 @@ index 395460b..05873cc 100755 ##--------------------------------------------------------------------## ##--- Cachegrind's differencer. cg_diff.in ---## diff --git a/massif/ms_print.in b/massif/ms_print.in -index e6fae89..3b85b40 100755 +index a206ce4..df1bc31 100755 --- a/massif/ms_print.in +++ b/massif/ms_print.in @@ -1,4 +1,4 @@
@@ -55,7 +56,7 @@ index e6fae89..3b85b40 100755 ##--------------------------------------------------------------------## ##--- Massif's results printer ms_print.in ---## diff --git a/perf/vg_perf.in b/perf/vg_perf.in -index 7a80cb0..28f6156 100644 +index 90ee1d2..c585096 100644 --- a/perf/vg_perf.in +++ b/perf/vg_perf.in @@ -1,4 +1,4 @@
@@ -65,7 +66,7 @@ index 7a80cb0..28f6156 100644 ##--- Valgrind performance testing script vg_perf ---## ##--------------------------------------------------------------------## diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in -index cb05b52..032e947 100755 +index 0fe6341..1b45eb7 100755 --- a/tests/vg_regtest.in +++ b/tests/vg_regtest.in @@ -1,4 +1,4 @@
@@ -74,5 +75,6 @@ index cb05b52..032e947 100755 ##--------------------------------------------------------------------## ##--- Valgrind regression testing script vg_regtest ---## ##--------------------------------------------------------------------## ---- -2.4.0 +-- +2.29.2 +
meta/recipes-devtools/valgrind/valgrind/run-ptest +2 -1
@@ -7,6 +7,7 @@ # Randy MacLeod <[email protected]> ############################################################### VALGRIND_LIB=@libdir@/valgrind +VALGRIND_LIBEXECDIR=@libexecdir@/valgrind VALGRIND_BIN=@bindir@/valgrind LOG="${VALGRIND_LIB}/ptest/valgrind_ptest_$(date +%Y%m%d-%H%M%S).log"
@@ -33,7 +34,7 @@ fi cd ${VALGRIND_LIB}/ptest && ./tests/vg_regtest \ --valgrind=${VALGRIND_BIN} \ - --valgrind-lib=${VALGRIND_LIB} \ + --valgrind-lib=${VALGRIND_LIBEXECDIR} \ --yocto-ptest \ gdbserver_tests ${TOOLS} ${EXP_TOOLS} \ 2>&1|tee ${LOG}
meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch +20 -4
@@ -1,3 +1,8 @@ +From 8154d38bac5cdb3675cfdaf562ab9da01988b263 Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <[email protected]> +Date: Wed, 17 Mar 2021 12:16:31 -0400 +Subject: [PATCH 19/20] remove s390x_vec_op_t + s390x_vec_op_t is not needed anywhere, only elements of enum are accessed removing it ensures that valgrind can be built with -fno-common option
@@ -6,14 +11,25 @@ ld: ../../VEX/libvex-amd64-linux.a(libvex_amd64_linux_a-guest_s390_helpers.o):/u Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> + +Signed-off-by: Yi Fan Yu <[email protected]> +--- + VEX/priv/guest_s390_defs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h +index 9054290..dab8002 100644 --- a/VEX/priv/guest_s390_defs.h +++ b/VEX/priv/guest_s390_defs.h -@@ -286,7 +286,7 @@ enum { - S390_VEC_OP_VFCHE = 18, - S390_VEC_OP_VFTCI = 19, - S390_VEC_OP_LAST = 20 // supposed to be the last element in enum +@@ -284,7 +284,7 @@ typedef enum { + S390_VEC_OP_VBPERM, + S390_VEC_OP_VMSL, + S390_VEC_OP_LAST // supposed to be the last element in enum -} s390x_vec_op_t; +}; /* Arguments of s390x_dirtyhelper_vec_op(...) which are packed into one ULong variable. +-- +2.29.2 +
meta/recipes-devtools/valgrind/valgrind_3.17.0.bb renamed from meta/recipes-devtools/valgrind/valgrind_3.16.1.bb +14 -11
@@ -42,14 +42,10 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://s390x_vec_op_t.patch \ file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ - file://0001-drd-Port-to-Fedora-33.patch \ - file://0001-drd-musl-fix.patch \ - file://0001-helgrind-Intercept-libc-functions.patch \ - file://0001-Fix-nlcontrolc.vgtest-hanging-on-newer-glibc-and-or-.patch \ - file://0001-lmw-lswi-and-related-PowerPC-insns-aren-t-allowed-on.patch \ + file://0001-Add-missing-musl.supp.patch \ " -SRC_URI[md5sum] = "d1b153f1ab17cf1f311705e7a83ef589" -SRC_URI[sha256sum] = "c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca" +SRC_URI[md5sum] = "afe11b5572c3121a781433b7c0ab741b" +SRC_URI[sha256sum] = "ad3aec668e813e40f238995f60796d9590eee64a16dff88421430630e69285a2" UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux'
@@ -58,6 +54,7 @@ COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' # argument. Change expected stderr files accordingly. do_patch_append() { bb.build.exec_func('do_sed_paths', d) + } do_sed_paths() {
@@ -110,7 +107,7 @@ do_configure_prepend () { } do_install_append () { - install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/ + install -m 644 ${B}/default.supp ${D}/${libexecdir}/valgrind/ oe_multilib_header valgrind/config.h }
@@ -125,7 +122,7 @@ VALGRINDARCH_powerpc = "ppc" VALGRINDARCH_powerpc64 = "ppc64" VALGRINDARCH_powerpc64el = "ppc64le" -INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/valgrind/vgpreload_memcheck-${VALGRINDARCH}-linux.so" +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libexecdir}/valgrind/vgpreload_memcheck-${VALGRINDARCH}-linux.so" RDEPENDS_${PN} += "perl"
@@ -137,7 +134,8 @@ RDEPENDS_${PN}-ptest += " bash coreutils file \ gdb libgomp \ perl \ perl-module-file-basename perl-module-file-glob perl-module-getopt-long \ - perl-module-overloading \ + perl-module-overloading perl-module-cwd perl-module-ipc-open3 \ + perl-module-carp perl-module-symbol \ procps sed ${PN}-dbg ${PN}-src" RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
@@ -222,8 +220,13 @@ do_install_ptest() { sed -i s:\.\./\.\./callgrind/callgrind_annotate:${bindir}/callgrind_annotate: ${D}${PTEST_PATH}/callgrind/tests/ann1.vgtest sed -i s:\.\./\.\./callgrind/callgrind_annotate:${bindir}/callgrind_annotate: ${D}${PTEST_PATH}/callgrind/tests/ann2.vgtest + # point the expanded @abs_top_builddir@ of the host to PTEST_PATH + sed -i s:${S}:${PTEST_PATH}:g \ + ${D}${PTEST_PATH}/memcheck/tests/linux/debuginfod-check.vgtest + # handle multilib sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest + sed -i s:@libexecdir@:${libexecdir}:g ${D}${PTEST_PATH}/run-ptest sed -i s:@bindir@:${bindir}:g ${D}${PTEST_PATH}/run-ptest # This test fails on the host as well, using both 3.15 and git master (as of Jan 24 2020)
@@ -238,7 +241,7 @@ do_install_ptest() { # avoid stripping some generated binaries otherwise some of the tests will fail # run-strip-reloc.sh, run-strip-strmerge.sh and so on will fail -INHIBIT_PACKAGE_STRIP_FILES = "\ +INHIBIT_PACKAGE_STRIP_FILES += "\ ${PKGD}${PTEST_PATH}/none/tests/tls \ ${PKGD}${PTEST_PATH}/none/tests/tls.so \ ${PKGD}${PTEST_PATH}/none/tests/tls2.so \
Signature · 1 line
2.17.1
PATCH v3 2/2 valgrind: Disable ptest swapcontext.vgtest
New test introduced in valgrind 3.17.0.
Test fails on both qemuarm64 and qemux64.
[YOCTO #14324]
---
Changes in V3:
Added Reference to Yocto bug in the patch itself
...orarily-drd-tests-swapcontext.vgtest.patch | 29 +++++++++++++++++++ .../valgrind/valgrind_3.17.0.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-Disable-temporarily-drd-tests-swapcontext.vgtest.patch
meta/recipes-devtools/valgrind/valgrind/0001-Disable-temporarily-drd-tests-swapcontext.vgtest.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 0f1814a618eff4233e9e8379a8cb2dededdc5a8b Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <[email protected]> +Date: Tue, 23 Mar 2021 11:09:20 -0700 +Subject: [PATCH] Disable temporarily drd/tests/swapcontext.vgtest + +New test introduced in valgrind 3.17.0. +Test fails on both qemuarm64 and qemux64. + +Upstream-Status: Pending [Needs more Investigation] +[YOCTO #14324] + +Signed-off-by: Yi Fan Yu <[email protected]> +--- + drd/tests/swapcontext.vgtest | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drd/tests/swapcontext.vgtest b/drd/tests/swapcontext.vgtest +index 98e3712c4..5492da31d 100644 +--- a/drd/tests/swapcontext.vgtest ++++ b/drd/tests/swapcontext.vgtest +@@ -1,4 +1,4 @@ +-prereq: test -e swapcontext && ./supported_libpthread ++prereq: false + vgopts: --read-var-info=yes --check-stack-var=yes --show-confl-seg=no --num-callers=2 + prog: swapcontext + stderr_filter: filter_stderr +-- +2.17.1 +
meta/recipes-devtools/valgrind/valgrind_3.17.0.bb +1 -0
@@ -43,6 +43,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ file://0001-Add-missing-musl.supp.patch \ + file://0001-Disable-temporarily-drd-tests-swapcontext.vgtest.patch \ " SRC_URI[md5sum] = "afe11b5572c3121a781433b7c0ab741b" SRC_URI[sha256sum] = "ad3aec668e813e40f238995f60796d9590eee64a16dff88421430630e69285a2"
Signature · 1 line
2.17.1
Hi Yi Fan
Quoted 19 lines · On Saturday, 27 March 2021 03:37:09 NZDT Yi Fan Yu wrote:
Notable changes:
* library is now in libexecdir instead of libdirAdded patches:
* Add musl.supp: missing musl.supp in 3.17.0Dropped backport patches:
* nlcontrolc: found inc79180a3afcf65902e578646c3b716cc749db406
* drd Fedora33: found in15330adf7c2471fbaa6a0818db07078d81dbff97
* lmw lswi ppc64le: found in74b74174d572fee4015b8f4e326db3cd949bcdc3Other dropped patches
* helgrind intercept: found ind2d54dbcc74244adfc0c80b40862edf2b82f53b9
* drd musl fix: found ind2d54dbcc74244adfc0c80b40862edf2b82f53b9TESTING RESULTS:
qemux86-64:
FAIL: drd/tests/swapcontext
Quoted 6 lines
3.17.0 3.16.1 =================== TOTAL: 736 726 PASSED: 694 688 FAILED: 1 0 SKIPPED: 41 38
Can you take a look at the following ptest failure:
AssertionError: Failed ptests:
{'valgrind': ['callgrind/tests/simwork-branch']}
https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/1657/steps/12/logs/stdio
(To be fair I'm not 100% sure if this only started happening after your patch though.)
Thanks
Paul
Quoted 8 lines · Paul Eggleton
[Please note: This e-mail is from an EXTERNAL e-mail address]
AssertionError: Failed ptests:
{'valgrind': ['callgrind/tests/simwork-branch']}https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/1657/steps/12/logs/stdio
(To be fair I'm not 100% sure if this only started happening after your patch though.)
This is very strange, never seen this test appear in the failure list. I looked at the more recent runs and don't see this failure reproduced.
Anyways I went ahead and made sure at least it works on my machine
```
on qemuarm64 running on my personal x86-64 machine
=== Test Summary ===
TOTAL: 408
PASSED: 390
FAILED: 0
SKIPPED: 18
DURATION: 2941
END: /usr/lib/valgrind/ptest
This is after the patch 1/2 3.16.1->3.17.0
TOTAL: 419
PASSED: 398
FAILED: 1
SKIPPED: 20
DURATION: 3053
Failed test is the drd/swapcontext
//yifan