|
From: Chen Di <di....@ou...> - 2022-03-30 09:49:51
|
From f658330f0eb8de981055407db4bc808f4a3b1806 Mon Sep 17 00:00:00 2001
From: Di Chen <di...@re...>
Date: Wed, 30 Mar 2022 07:59:25 +0800
Subject: [PATCH] memfd test should be memfd_create test
Currently, syscall memfd_create was tested by this:
$ perl tests/vg_regtest memcheck/tests/linux/memfd.vgtest
Since memfd_secret introduced in kernel 5.14, valgrind should rename
the "memfd" test to "memfd_create" test to avoid the ambiguity, so that
user will not get confused with the "memfd_secret" test.
After this change, syscall memfd_create will be tested by:
$ perl tests/vg_regtest memcheck/tests/linux/memfd_create.vgtest
---
.gitignore | 2 +-
memcheck/tests/linux/Makefile.am | 4 ++--
memcheck/tests/linux/memfd.vgtest | 3 ---
memcheck/tests/linux/{memfd.c => memfd_create.c} | 0
.../tests/linux/{memfd.stderr.exp => memfd_create.stderr.exp} | 4 ++--
memcheck/tests/linux/memfd_create.vgtest | 3 +++
6 files changed, 8 insertions(+), 8 deletions(-)
delete mode 100644 memcheck/tests/linux/memfd.vgtest
rename memcheck/tests/linux/{memfd.c => memfd_create.c} (100%)
rename memcheck/tests/linux/{memfd.stderr.exp => memfd_create.stderr.exp} (57%)
create mode 100644 memcheck/tests/linux/memfd_create.vgtest
diff --git a/.gitignore b/.gitignore
index 5d9ba7c42..1fc07c964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1100,7 +1100,7 @@
/memcheck/tests/linux/lsframe2
/memcheck/tests/linux/Makefile
/memcheck/tests/linux/Makefile.in
-/memcheck/tests/linux/memfd
+/memcheck/tests/linux/memfd_create
/memcheck/tests/linux/rfcomm
/memcheck/tests/linux/sigqueue
/memcheck/tests/linux/stack_changes
diff --git a/memcheck/tests/linux/Makefile.am b/memcheck/tests/linux/Makefile.am
index 4f0d83843..d5991dc5e 100644
--- a/memcheck/tests/linux/Makefile.am
+++ b/memcheck/tests/linux/Makefile.am
@@ -15,7 +15,7 @@ EXTRA_DIST = \
ioctl-tiocsig.vgtest ioctl-tiocsig.stderr.exp \
lsframe1.vgtest lsframe1.stdout.exp lsframe1.stderr.exp \
lsframe2.vgtest lsframe2.stdout.exp lsframe2.stderr.exp \
- memfd.vgtest memfd.stderr.exp \
+ memfd_create.vgtest memfd_create.stderr.exp \
rfcomm.vgtest rfcomm.stderr.exp \
sigqueue.vgtest sigqueue.stderr.exp \
stack_changes.stderr.exp stack_changes.stdout.exp \
@@ -62,7 +62,7 @@ check_PROGRAMS += sys-openat
endif
if HAVE_MEMFD_CREATE
-check_PROGRAMS += memfd
+check_PROGRAMS += memfd_create
endif
if HAVE_COPY_FILE_RANGE
diff --git a/memcheck/tests/linux/memfd.vgtest b/memcheck/tests/linux/memfd.vgtest
deleted file mode 100644
index 4096401f7..000000000
--- a/memcheck/tests/linux/memfd.vgtest
+++ /dev/null
@@ -1,3 +0,0 @@
-prereq: test -e memfd
-vgopts: -q --track-origins=yes
-prog: memfd
diff --git a/memcheck/tests/linux/memfd.c b/memcheck/tests/linux/memfd_create.c
similarity index 100%
rename from memcheck/tests/linux/memfd.c
rename to memcheck/tests/linux/memfd_create.c
diff --git a/memcheck/tests/linux/memfd.stderr.exp b/memcheck/tests/linux/memfd_create.stderr.exp
similarity index 57%
rename from memcheck/tests/linux/memfd.stderr.exp
rename to memcheck/tests/linux/memfd_create.stderr.exp
index 13009d8ae..27ccbfe49 100644
--- a/memcheck/tests/linux/memfd.stderr.exp
+++ b/memcheck/tests/linux/memfd_create.stderr.exp
@@ -1,6 +1,6 @@
Syscall param fcntl(arg) contains uninitialised byte(s)
...
- by 0x........: main (memfd.c:72)
+ by 0x........: main (memfd_create.c:72)
Uninitialised value was created by a client request
- at 0x........: main (memfd.c:71)
+ at 0x........: main (memfd_create.c:71)
diff --git a/memcheck/tests/linux/memfd_create.vgtest b/memcheck/tests/linux/memfd_create.vgtest
new file mode 100644
index 000000000..13b956333
--- /dev/null
+++ b/memcheck/tests/linux/memfd_create.vgtest
@@ -0,0 +1,3 @@
+prereq: test -e memfd_create
+vgopts: -q --track-origins=yes
+prog: memfd_create
--
2.35.1
|
|
From: Chen Di <di....@ou...> - 2022-03-30 10:00:37
|
Hey team valgrind, Sorry for the confusing post, I think my patch got formatted slightly in an odd way. I have also attached the patch to bug: https://bugs.kde.org/show_bug.cgi?id=451878 Could you please review it when you are avalable? Cheers ________________________________ 发件人: Chen Di <di....@ou...> 发送时间: 2022年3月30日 17:49 收件人: val...@li... <val...@li...> 主题: [Valgrind-developers] [patch] memfd test should be memfd_create test From f658330f0eb8de981055407db4bc808f4a3b1806 Mon Sep 17 00:00:00 2001 From: Di Chen <di...@re...> Date: Wed, 30 Mar 2022 07:59:25 +0800 Subject: [PATCH] memfd test should be memfd_create test Currently, syscall memfd_create was tested by this: $ perl tests/vg_regtest memcheck/tests/linux/memfd.vgtest Since memfd_secret introduced in kernel 5.14, valgrind should rename the "memfd" test to "memfd_create" test to avoid the ambiguity, so that user will not get confused with the "memfd_secret" test. After this change, syscall memfd_create will be tested by: $ perl tests/vg_regtest memcheck/tests/linux/memfd_create.vgtest --- .gitignore | 2 +- memcheck/tests/linux/Makefile.am | 4 ++-- memcheck/tests/linux/memfd.vgtest | 3 --- memcheck/tests/linux/{memfd.c => memfd_create.c} | 0 .../tests/linux/{memfd.stderr.exp => memfd_create.stderr.exp} | 4 ++-- memcheck/tests/linux/memfd_create.vgtest | 3 +++ 6 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 memcheck/tests/linux/memfd.vgtest rename memcheck/tests/linux/{memfd.c => memfd_create.c} (100%) rename memcheck/tests/linux/{memfd.stderr.exp => memfd_create.stderr.exp} (57%) create mode 100644 memcheck/tests/linux/memfd_create.vgtest diff --git a/.gitignore b/.gitignore index 5d9ba7c42..1fc07c964 100644 --- a/.gitignore +++ b/.gitignore @@ -1100,7 +1100,7 @@ /memcheck/tests/linux/lsframe2 /memcheck/tests/linux/Makefile /memcheck/tests/linux/Makefile.in -/memcheck/tests/linux/memfd +/memcheck/tests/linux/memfd_create /memcheck/tests/linux/rfcomm /memcheck/tests/linux/sigqueue /memcheck/tests/linux/stack_changes diff --git a/memcheck/tests/linux/Makefile.am b/memcheck/tests/linux/Makefile.am index 4f0d83843..d5991dc5e 100644 --- a/memcheck/tests/linux/Makefile.am +++ b/memcheck/tests/linux/Makefile.am @@ -15,7 +15,7 @@ EXTRA_DIST = \ ioctl-tiocsig.vgtest ioctl-tiocsig.stderr.exp \ lsframe1.vgtest lsframe1.stdout.exp lsframe1.stderr.exp \ lsframe2.vgtest lsframe2.stdout.exp lsframe2.stderr.exp \ - memfd.vgtest memfd.stderr.exp \ + memfd_create.vgtest memfd_create.stderr.exp \ rfcomm.vgtest rfcomm.stderr.exp \ sigqueue.vgtest sigqueue.stderr.exp \ stack_changes.stderr.exp stack_changes.stdout.exp \ @@ -62,7 +62,7 @@ check_PROGRAMS += sys-openat endif if HAVE_MEMFD_CREATE -check_PROGRAMS += memfd +check_PROGRAMS += memfd_create endif if HAVE_COPY_FILE_RANGE diff --git a/memcheck/tests/linux/memfd.vgtest b/memcheck/tests/linux/memfd.vgtest deleted file mode 100644 index 4096401f7..000000000 --- a/memcheck/tests/linux/memfd.vgtest +++ /dev/null @@ -1,3 +0,0 @@ -prereq: test -e memfd -vgopts: -q --track-origins=yes -prog: memfd diff --git a/memcheck/tests/linux/memfd.c b/memcheck/tests/linux/memfd_create.c similarity index 100% rename from memcheck/tests/linux/memfd.c rename to memcheck/tests/linux/memfd_create.c diff --git a/memcheck/tests/linux/memfd.stderr.exp b/memcheck/tests/linux/memfd_create.stderr.exp similarity index 57% rename from memcheck/tests/linux/memfd.stderr.exp rename to memcheck/tests/linux/memfd_create.stderr.exp index 13009d8ae..27ccbfe49 100644 --- a/memcheck/tests/linux/memfd.stderr.exp +++ b/memcheck/tests/linux/memfd_create.stderr.exp @@ -1,6 +1,6 @@ Syscall param fcntl(arg) contains uninitialised byte(s) ... - by 0x........: main (memfd.c:72) + by 0x........: main (memfd_create.c:72) Uninitialised value was created by a client request - at 0x........: main (memfd.c:71) + at 0x........: main (memfd_create.c:71) diff --git a/memcheck/tests/linux/memfd_create.vgtest b/memcheck/tests/linux/memfd_create.vgtest new file mode 100644 index 000000000..13b956333 --- /dev/null +++ b/memcheck/tests/linux/memfd_create.vgtest @@ -0,0 +1,3 @@ +prereq: test -e memfd_create +vgopts: -q --track-origins=yes +prog: memfd_create -- 2.35.1 |
|
From: Mark W. <ma...@kl...> - 2022-04-06 22:36:08
|
Hi, On Wed, Mar 30, 2022 at 10:00:20AM +0000, Chen Di wrote: > Sorry for the confusing post, I think my patch got formatted slightly in an odd way. > > I have also attached the patch to bug: https://bugs.kde.org/show_bug.cgi?id=451878 > Could you please review it when you are avalable? Thanks, that applied fine. And I admit having been confused by memfd_create vs memfd_secret before. I have pushed this. Hope that helps creating a separate memfd_secret. But we are very close to the 3.19.0 release. So that might have to wait till after the release. Cheers, Mark |