Message ID | 1597289377-3502-1-git-send-email-xuyang2018.jy@cn.fujitsu.com |
---|---|
State | Changes Requested |
Headers | show |
Series | [v2] syscalls/msgget04: Add test for /proc/sys/kernel/msg_next_id | expand |
Hi Cyril > Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com> > --- > v1-v2: > 1.queue_id doesn't need to init to 1 > 2.reset msg_next_id value to -1 in cleanup > runtest/syscalls | 1 + > runtest/syscalls-ipc | 1 + > .../kernel/syscalls/ipc/msgget/.gitignore | 1 + > .../kernel/syscalls/ipc/msgget/msgget04.c | 70 +++++++++++++++++++ > 4 files changed, 73 insertions(+) > create mode 100644 testcases/kernel/syscalls/ipc/msgget/msgget04.c > > diff --git a/runtest/syscalls b/runtest/syscalls > index 98d79271d..41cd8a159 100644 > --- a/runtest/syscalls > +++ b/runtest/syscalls > @@ -810,6 +810,7 @@ msgctl12 msgctl12 > msgget01 msgget01 > msgget02 msgget02 > msgget03 msgget03 > +msgget04 msgget04 > > msgrcv01 msgrcv01 > msgrcv02 msgrcv02 > diff --git a/runtest/syscalls-ipc b/runtest/syscalls-ipc > index 41d54d939..d4baaa262 100644 > --- a/runtest/syscalls-ipc > +++ b/runtest/syscalls-ipc > @@ -12,6 +12,7 @@ msgctl12 msgctl12 > msgget01 msgget01 > msgget02 msgget02 > msgget03 msgget03 > +msgget04 msgget04 > > msgrcv01 msgrcv01 > msgrcv02 msgrcv02 > diff --git a/testcases/kernel/syscalls/ipc/msgget/.gitignore b/testcases/kernel/syscalls/ipc/msgget/.gitignore > index 3b2dfb518..7a9d5e340 100644 > --- a/testcases/kernel/syscalls/ipc/msgget/.gitignore > +++ b/testcases/kernel/syscalls/ipc/msgget/.gitignore > @@ -1,3 +1,4 @@ > /msgget01 > /msgget02 > /msgget03 > +/msgget04 > diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget04.c b/testcases/kernel/syscalls/ipc/msgget/msgget04.c > new file mode 100644 > index 000000000..d14aadd12 > --- /dev/null > +++ b/testcases/kernel/syscalls/ipc/msgget/msgget04.c > @@ -0,0 +1,70 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved. > + * Author: Yang Xu <xuyang2018.jy@cn.jujitsu.com> > + * > + * It is a basic test about msg_next_id. > + * msg_next_id specifies desired id for next allocated IPC message. By default > + * they are equal to -1, which means generic allocation logic. Possible values > + * to set are in range {0..INT_MAX}. > + * Toggle with non-default value will be set back to -1 by kernel after > + * successful IPC object allocation. > + */ > + > +#include <errno.h> > +#include <string.h> > +#include <sys/types.h> > +#include <sys/ipc.h> > +#include <sys/msg.h> > +#include "tst_test.h" > +#include "tst_safe_sysv_ipc.h" > +#include "libnewipc.h" > + > +#define NEXT_ID_PATH "/proc/sys/kernel/msg_next_id" > +static int queue_id, pid; > +static key_t msgkey; > + > +static void verify_msgget(void) > +{ > + SAFE_FILE_PRINTF(NEXT_ID_PATH, "%d", pid); > + > + TEST(msgget(msgkey, IPC_CREAT | MSG_RW)); > + if (TST_RET == -1) { > + tst_res(TFAIL | TTERRNO, "msgget() failed"); > + return; > + } > + I forgot we have SAFE_MSGGET macro. we can directly use it in here. > + queue_id = TST_RET; > + if (queue_id == pid) > + tst_res(TPASS, "msg_next_id succeeded, queue id %d", pid); > + else > + tst_res(TFAIL, "msg_next_id failed, expected id %d, but got %d", pid, queue_id); > + > + TST_ASSERT_INT(NEXT_ID_PATH, -1); > + SAFE_MSGCTL(queue_id, IPC_RMID, NULL); > + pid++; > +} > + > +static void setup(void) > +{ > + msgkey = GETIPCKEY(); > + pid = getpid(); > +} > + > +static void cleanup(void) > +{ > + if (queue_id != -1) > + SAFE_MSGCTL(queue_id, IPC_RMID, NULL); > + > + /*avoid EINVAL error when path value has been -1*/ > + SAFE_FILE_SCANF(NEXT_ID_PATH, "%d", &queue_id); > + if (queue_id != -1) > + SAFE_FILE_PRINTF(NEXT_ID_PATH, "-1"); > +} > + > +static struct tst_test test = { > + .setup = setup, > + .cleanup = cleanup, > + .test_all = verify_msgget, > + .needs_root = 1, > +}; >
diff --git a/runtest/syscalls b/runtest/syscalls index 98d79271d..41cd8a159 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -810,6 +810,7 @@ msgctl12 msgctl12 msgget01 msgget01 msgget02 msgget02 msgget03 msgget03 +msgget04 msgget04 msgrcv01 msgrcv01 msgrcv02 msgrcv02 diff --git a/runtest/syscalls-ipc b/runtest/syscalls-ipc index 41d54d939..d4baaa262 100644 --- a/runtest/syscalls-ipc +++ b/runtest/syscalls-ipc @@ -12,6 +12,7 @@ msgctl12 msgctl12 msgget01 msgget01 msgget02 msgget02 msgget03 msgget03 +msgget04 msgget04 msgrcv01 msgrcv01 msgrcv02 msgrcv02 diff --git a/testcases/kernel/syscalls/ipc/msgget/.gitignore b/testcases/kernel/syscalls/ipc/msgget/.gitignore index 3b2dfb518..7a9d5e340 100644 --- a/testcases/kernel/syscalls/ipc/msgget/.gitignore +++ b/testcases/kernel/syscalls/ipc/msgget/.gitignore @@ -1,3 +1,4 @@ /msgget01 /msgget02 /msgget03 +/msgget04 diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget04.c b/testcases/kernel/syscalls/ipc/msgget/msgget04.c new file mode 100644 index 000000000..d14aadd12 --- /dev/null +++ b/testcases/kernel/syscalls/ipc/msgget/msgget04.c @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved. + * Author: Yang Xu <xuyang2018.jy@cn.jujitsu.com> + * + * It is a basic test about msg_next_id. + * msg_next_id specifies desired id for next allocated IPC message. By default + * they are equal to -1, which means generic allocation logic. Possible values + * to set are in range {0..INT_MAX}. + * Toggle with non-default value will be set back to -1 by kernel after + * successful IPC object allocation. + */ + +#include <errno.h> +#include <string.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <sys/msg.h> +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" +#include "libnewipc.h" + +#define NEXT_ID_PATH "/proc/sys/kernel/msg_next_id" +static int queue_id, pid; +static key_t msgkey; + +static void verify_msgget(void) +{ + SAFE_FILE_PRINTF(NEXT_ID_PATH, "%d", pid); + + TEST(msgget(msgkey, IPC_CREAT | MSG_RW)); + if (TST_RET == -1) { + tst_res(TFAIL | TTERRNO, "msgget() failed"); + return; + } + + queue_id = TST_RET; + if (queue_id == pid) + tst_res(TPASS, "msg_next_id succeeded, queue id %d", pid); + else + tst_res(TFAIL, "msg_next_id failed, expected id %d, but got %d", pid, queue_id); + + TST_ASSERT_INT(NEXT_ID_PATH, -1); + SAFE_MSGCTL(queue_id, IPC_RMID, NULL); + pid++; +} + +static void setup(void) +{ + msgkey = GETIPCKEY(); + pid = getpid(); +} + +static void cleanup(void) +{ + if (queue_id != -1) + SAFE_MSGCTL(queue_id, IPC_RMID, NULL); + + /*avoid EINVAL error when path value has been -1*/ + SAFE_FILE_SCANF(NEXT_ID_PATH, "%d", &queue_id); + if (queue_id != -1) + SAFE_FILE_PRINTF(NEXT_ID_PATH, "-1"); +} + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .test_all = verify_msgget, + .needs_root = 1, +};
Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com> --- v1-v2: 1.queue_id doesn't need to init to 1 2.reset msg_next_id value to -1 in cleanup runtest/syscalls | 1 + runtest/syscalls-ipc | 1 + .../kernel/syscalls/ipc/msgget/.gitignore | 1 + .../kernel/syscalls/ipc/msgget/msgget04.c | 70 +++++++++++++++++++ 4 files changed, 73 insertions(+) create mode 100644 testcases/kernel/syscalls/ipc/msgget/msgget04.c