diff mbox series

[7/9] syscalls/ipc: Add shmctl07 test

Message ID 20200717163453.9587-8-chrubis@suse.cz
State Superseded
Headers show
Series Rewrite shmctl() testcases | expand

Commit Message

Cyril Hrubis July 17, 2020, 4:34 p.m. UTC
A new test for SHM_LOCK and SHM_UNLOCK.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 runtest/syscalls                              |  1 +
 runtest/syscalls-ipc                          |  1 +
 .../kernel/syscalls/ipc/shmctl/.gitignore     |  1 +
 .../kernel/syscalls/ipc/shmctl/shmctl07.c     | 66 +++++++++++++++++++
 4 files changed, 69 insertions(+)
 create mode 100644 testcases/kernel/syscalls/ipc/shmctl/shmctl07.c

Comments

Li Wang July 19, 2020, 9:50 a.m. UTC | #1
On Sat, Jul 18, 2020 at 12:35 AM Cyril Hrubis <chrubis@suse.cz> wrote:

> ...
> +
> +static void verify_shmlock(void)
> +{
> +       struct shmid_ds ds;
> +
> +       TEST(shmctl(shm_id, SHM_LOCK, NULL));
> +
> +       if (TST_RET != 0)
> +               tst_res(TFAIL | TTERRNO, "shmctl(%i, SHM_LOCK, NULL)",
> shm_id);
> +       else
> +               tst_res(TPASS, "shmctl(%i, SHM_LOCK, NULL)", shm_id);
> +
> +
> +       SAFE_SHMCTL(shm_id, IPC_STAT, &ds);
> +
> +       if (ds.shm_perm.mode & SHM_LOCKED)
> +               tst_res(TPASS, "SMH_LOCKED bit is on in shm_perm.mode");
> +       else
> +               tst_res(TFAIL, "SHM_LOCKED bit is off in shm_perm.mode");
> +
> +       TEST(shmctl(shm_id, SHM_UNLOCK, NULL));
> +
> +       if (TST_RET != 0)
> +               tst_res(TFAIL | TTERRNO, "shmctl(%i, SHM_UNLOCK, NULL)",
> shm_id);
> +       else
> +               tst_res(TPASS, "shmctl(%i, SHM_UNLOCK, NULL)", shm_id);
> +
>

Shouldn't we do update 'ds' before checking the ds.shm_perm.mode?

--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl07.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl07.c
@@ -42,10 +42,11 @@ static void verify_shmlock(void)
        else
                tst_res(TPASS, "shmctl(%i, SHM_UNLOCK, NULL)", shm_id);

+       SAFE_SHMCTL(shm_id, IPC_STAT, &ds);
        if (ds.shm_perm.mode & SHM_LOCKED)
-               tst_res(TPASS, "SHM_LOCKED bit is off in shm_perm.mode");
-       else
                tst_res(TFAIL, "SMH_LOCKED bit is on in shm_perm.mode");
+       else
+               tst_res(TPASS, "SHM_LOCKED bit is off in shm_perm.mode");
 }



> +       if (ds.shm_perm.mode & SHM_LOCKED)
> +               tst_res(TPASS, "SHM_LOCKED bit is off in shm_perm.mode");
>

And in this branch, the status should be "on" but not "off".



> +       else
> +               tst_res(TFAIL, "SMH_LOCKED bit is on in shm_perm.mode");
> +}
> +
> +static void setup(void)
> +{
> +       shm_id = SAFE_SHMGET(IPC_PRIVATE, SHM_SIZE, IPC_CREAT | SHM_RW);
> +}
> +
> +static void cleanup(void)
> +{
> +       if (shm_id >= 0)
> +               SAFE_SHMCTL(shm_id, IPC_RMID, NULL);
> +}
> +
> +static struct tst_test test = {
> +       .setup = setup,
> +       .cleanup = cleanup,
> +       .test_all = verify_shmlock,
> +};
> --
> 2.26.2
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
>
>
Cyril Hrubis Sept. 7, 2020, 2:45 p.m. UTC | #2
Hi!
> Shouldn't we do update 'ds' before checking the ds.shm_perm.mode?
> 
> --- a/testcases/kernel/syscalls/ipc/shmctl/shmctl07.c
> +++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl07.c
> @@ -42,10 +42,11 @@ static void verify_shmlock(void)
>         else
>                 tst_res(TPASS, "shmctl(%i, SHM_UNLOCK, NULL)", shm_id);
> 
> +       SAFE_SHMCTL(shm_id, IPC_STAT, &ds);
>         if (ds.shm_perm.mode & SHM_LOCKED)
> -               tst_res(TPASS, "SHM_LOCKED bit is off in shm_perm.mode");
> -       else
>                 tst_res(TFAIL, "SMH_LOCKED bit is on in shm_perm.mode");
> +       else
> +               tst_res(TPASS, "SHM_LOCKED bit is off in shm_perm.mode");
>  }
> 
> 
> 
> > +       if (ds.shm_perm.mode & SHM_LOCKED)
> > +               tst_res(TPASS, "SHM_LOCKED bit is off in shm_perm.mode");
> >
> 
> And in this branch, the status should be "on" but not "off".

And also TFAIL.

All will be fixed in v2, thx for the review.
diff mbox series

Patch

diff --git a/runtest/syscalls b/runtest/syscalls
index 819e8d8ee..1dc4973e7 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -1359,6 +1359,7 @@  shmctl03 shmctl03
 shmctl04 shmctl04
 shmctl05 shmctl05
 shmctl06 shmctl06
+shmctl07 shmctl07
 
 shmdt01 shmdt01
 shmdt02 shmdt02
diff --git a/runtest/syscalls-ipc b/runtest/syscalls-ipc
index c3a35896c..613987589 100644
--- a/runtest/syscalls-ipc
+++ b/runtest/syscalls-ipc
@@ -57,6 +57,7 @@  shmctl03 shmctl03
 shmctl04 shmctl04
 shmctl05 shmctl05
 shmctl06 shmctl06
+shmctl07 shmctl07
 
 shmdt01 shmdt01
 shmdt02 shmdt02
diff --git a/testcases/kernel/syscalls/ipc/shmctl/.gitignore b/testcases/kernel/syscalls/ipc/shmctl/.gitignore
index 46b107344..4322d03b7 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/.gitignore
+++ b/testcases/kernel/syscalls/ipc/shmctl/.gitignore
@@ -4,3 +4,4 @@ 
 /shmctl04
 /shmctl05
 /shmctl06
+/shmctl07
diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl07.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl07.c
new file mode 100644
index 000000000..409203db7
--- /dev/null
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl07.c
@@ -0,0 +1,66 @@ 
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2020 Cyril Hrubis <chrubis@suse.cz>
+ */
+/*
+ * Test for a SHM_LOCK and SHM_UNLOCK.
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include "tst_test.h"
+#include "tst_safe_sysv_ipc.h"
+#include "libnewipc.h"
+
+#define SHM_SIZE 2048
+
+static int shm_id = -1;
+
+static void verify_shmlock(void)
+{
+	struct shmid_ds ds;
+
+	TEST(shmctl(shm_id, SHM_LOCK, NULL));
+
+	if (TST_RET != 0)
+		tst_res(TFAIL | TTERRNO, "shmctl(%i, SHM_LOCK, NULL)", shm_id);
+	else
+		tst_res(TPASS, "shmctl(%i, SHM_LOCK, NULL)", shm_id);
+
+
+	SAFE_SHMCTL(shm_id, IPC_STAT, &ds);
+
+	if (ds.shm_perm.mode & SHM_LOCKED)
+		tst_res(TPASS, "SMH_LOCKED bit is on in shm_perm.mode");
+	else
+		tst_res(TFAIL, "SHM_LOCKED bit is off in shm_perm.mode");
+
+	TEST(shmctl(shm_id, SHM_UNLOCK, NULL));
+
+	if (TST_RET != 0)
+		tst_res(TFAIL | TTERRNO, "shmctl(%i, SHM_UNLOCK, NULL)", shm_id);
+	else
+		tst_res(TPASS, "shmctl(%i, SHM_UNLOCK, NULL)", shm_id);
+
+	if (ds.shm_perm.mode & SHM_LOCKED)
+		tst_res(TPASS, "SHM_LOCKED bit is off in shm_perm.mode");
+	else
+		tst_res(TFAIL, "SMH_LOCKED bit is on in shm_perm.mode");
+}
+
+static void setup(void)
+{
+	shm_id = SAFE_SHMGET(IPC_PRIVATE, SHM_SIZE, IPC_CREAT | SHM_RW);
+}
+
+static void cleanup(void)
+{
+	if (shm_id >= 0)
+		SAFE_SHMCTL(shm_id, IPC_RMID, NULL);
+}
+
+static struct tst_test test = {
+	.setup = setup,
+	.cleanup = cleanup,
+	.test_all = verify_shmlock,
+};