[1/2] madvise: add MADV_WIPEONFORK/MADV_KEEPONFORK in madvise() test

Message ID 20180514092635.26100-1-liwang@redhat.com
State Accepted
Delegated to: Petr Vorel
Headers show
Series
  • [1/2] madvise: add MADV_WIPEONFORK/MADV_KEEPONFORK in madvise() test
Related show

Commit Message

Li Wang May 14, 2018, 9:26 a.m.
The kernel commit (d2cd9ed mm,fork: introduce MADV_WIPEONFORK)
introduces two new advices for madvise() in kernel-v4.14. Here
making LTP cover that test accordingly.

Signed-off-by: Li Wang <liwang@redhat.com>
---
 include/lapi/mmap.h                           | 5 +++++
 testcases/kernel/syscalls/madvise/madvise01.c | 3 +++
 2 files changed, 8 insertions(+)

Comments

Li Wang June 8, 2018, 9:14 a.m. | #1
ping

On Mon, May 14, 2018 at 5:26 PM, Li Wang <liwang@redhat.com> wrote:

> The kernel commit (d2cd9ed mm,fork: introduce MADV_WIPEONFORK)
> introduces two new advices for madvise() in kernel-v4.14. Here
> making LTP cover that test accordingly.
>
> Signed-off-by: Li Wang <liwang@redhat.com>
> ---
>  include/lapi/mmap.h                           | 5 +++++
>  testcases/kernel/syscalls/madvise/madvise01.c | 3 +++
>  2 files changed, 8 insertions(+)
>
> diff --git a/include/lapi/mmap.h b/include/lapi/mmap.h
> index 7a55800..18547c0 100644
> --- a/include/lapi/mmap.h
> +++ b/include/lapi/mmap.h
> @@ -71,6 +71,11 @@
>  # define MADV_FREE     8
>  #endif
>
> +#ifndef MADV_WIPEONFORK
> +# define MADV_WIPEONFORK 18
> +# define MADV_KEEPONFORK 19
> +#endif
> +
>  #ifdef HAVE_SYS_SHM_H
>  # include <sys/shm.h>
>  # define MMAP_GRANULARITY SHMLBA
> diff --git a/testcases/kernel/syscalls/madvise/madvise01.c
> b/testcases/kernel/syscalls/madvise/madvise01.c
> index 4b18a21..8d1d787 100644
> --- a/testcases/kernel/syscalls/madvise/madvise01.c
> +++ b/testcases/kernel/syscalls/madvise/madvise01.c
> @@ -62,6 +62,9 @@ static struct tcase {
>         {MADV_DONTDUMP,    "MADV_DONTDUMP",    &sfile}, /* since Linux 3.4
> */
>         {MADV_DODUMP,      "MADV_DODUMP",      &sfile}, /* since Linux 3.4
> */
>         {MADV_FREE,        "MADV_FREE",        &amem},  /* since Linux 4.5
> */
> +       {MADV_WIPEONFORK,  "MADV_WIPEONFORK",  &amem},  /* since Linux
> 4.14 */
> +       {MADV_KEEPONFORK,  "MADV_KEEPONFORK",  &amem},  /* since Linux
> 4.14 */
> +
>  };
>
>  static void setup(void)
> --
> 2.9.5
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
>
Jan Stancek June 19, 2018, 12:06 p.m. | #2
----- Original Message -----
> ping
> 
> On Mon, May 14, 2018 at 5:26 PM, Li Wang < liwang@redhat.com > wrote:
> 
> 
> The kernel commit (d2cd9ed mm,fork: introduce MADV_WIPEONFORK)
> introduces two new advices for madvise() in kernel-v4.14. Here
> making LTP cover that test accordingly.
> 
> Signed-off-by: Li Wang < liwang@redhat.com >

Both pushed. I pushed an extra commit on top, to print
advice that is being tested in madvise02.

Thanks,
Jan

Patch

diff --git a/include/lapi/mmap.h b/include/lapi/mmap.h
index 7a55800..18547c0 100644
--- a/include/lapi/mmap.h
+++ b/include/lapi/mmap.h
@@ -71,6 +71,11 @@ 
 # define MADV_FREE	8
 #endif
 
+#ifndef MADV_WIPEONFORK
+# define MADV_WIPEONFORK 18
+# define MADV_KEEPONFORK 19
+#endif
+
 #ifdef HAVE_SYS_SHM_H
 # include <sys/shm.h>
 # define MMAP_GRANULARITY SHMLBA
diff --git a/testcases/kernel/syscalls/madvise/madvise01.c b/testcases/kernel/syscalls/madvise/madvise01.c
index 4b18a21..8d1d787 100644
--- a/testcases/kernel/syscalls/madvise/madvise01.c
+++ b/testcases/kernel/syscalls/madvise/madvise01.c
@@ -62,6 +62,9 @@  static struct tcase {
 	{MADV_DONTDUMP,    "MADV_DONTDUMP",    &sfile}, /* since Linux 3.4 */
 	{MADV_DODUMP,      "MADV_DODUMP",      &sfile}, /* since Linux 3.4 */
 	{MADV_FREE,        "MADV_FREE",        &amem},  /* since Linux 4.5 */
+	{MADV_WIPEONFORK,  "MADV_WIPEONFORK",  &amem},  /* since Linux 4.14 */
+	{MADV_KEEPONFORK,  "MADV_KEEPONFORK",  &amem},  /* since Linux 4.14 */
+
 };
 
 static void setup(void)