[LTP] [PATCH v1] sigpending: use direct syscall

[LTP] [PATCH v1] sigpending: use direct syscall

[Matthias Maennich]

Expand coverage to the Android platform.

Signed-off-by: Matthias Maennich <maennich@google.com>
---
 testcases/kernel/syscalls/sigpending/sigpending02.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testcases/kernel/syscalls/sigpending/sigpending02.c b/testcases/kernel/syscalls/sigpending/sigpending02.c
index a38157ae1..ff8b59c8c 100644
--- a/testcases/kernel/syscalls/sigpending/sigpending02.c
+++ b/testcases/kernel/syscalls/sigpending/sigpending02.c
@@ -17,13 +17,14 @@
 #include <sys/types.h>
 
 #include "tst_test.h"
+#include "lapi/syscalls.h"
 
 static void run(void)
 {
 	/* set sigset to point to an invalid location */
 	sigset_t *sigset = (sigset_t *) - 1;
 
-	TEST(sigpending(sigset));
+	TEST(tst_syscall(__NR_rt_sigpending, sigset, NSIG / 8));
 
 	/* check return code */
 	if (TST_RET == -1) {
-- 
2.20.1.611.gfbb209baf1-goog

[LTP] [PATCH v1] sigpending: use direct syscall

[Steve Muckle]

On 02/07/2019 07:51 AM, Matthias Maennich wrote:
> Expand coverage to the Android platform.
> 
> Signed-off-by: Matthias Maennich <maennich@google.com>
> ---
>   testcases/kernel/syscalls/sigpending/sigpending02.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/testcases/kernel/syscalls/sigpending/sigpending02.c b/testcases/kernel/syscalls/sigpending/sigpending02.c
> index a38157ae1..ff8b59c8c 100644
> --- a/testcases/kernel/syscalls/sigpending/sigpending02.c
> +++ b/testcases/kernel/syscalls/sigpending/sigpending02.c
> @@ -17,13 +17,14 @@
>   #include <sys/types.h>
>   
>   #include "tst_test.h"
> +#include "lapi/syscalls.h"
>   
>   static void run(void)
>   {
>   	/* set sigset to point to an invalid location */
>   	sigset_t *sigset = (sigset_t *) - 1;
>   
> -	TEST(sigpending(sigset));
> +	TEST(tst_syscall(__NR_rt_sigpending, sigset, NSIG / 8));
>   
>   	/* check return code */
>   	if (TST_RET == -1) {

Should this be using __NR_sigpending instead? That worked for me (for 
32-bit anyway, it's not available on arm64).

Alternately, this test/dir could be renamed to rt_sigpending, though we 
should also add a test for sigpending.

thanks,
steve

[LTP] [PATCH v1] sigpending: use direct syscall

[Matthias =?unknown-8bit?q?M=C3=A4nnich?=]

> On 7 Feb 2019, at 18:58, Steve Muckle <smuckle@google.com> wrote:
> 
> On 02/07/2019 07:51 AM, Matthias Maennich wrote:
>>  	/* set sigset to point to an invalid location */
>>  	sigset_t *sigset = (sigset_t *) - 1;
>>  -	TEST(sigpending(sigset));
>> +	TEST(tst_syscall(__NR_rt_sigpending, sigset, NSIG / 8));
>>    	/* check return code */
>>  	if (TST_RET == -1) {
> 
> Should this be using __NR_sigpending instead? That worked for me (for 32-bit anyway, it's not available on arm64).
> 
> Alternately, this test/dir could be renamed to rt_sigpending, though we should also add a test for sigpending.
> 

Syscall wrappers usually call __NR_rt_sigpending if the kernel provides it. So, I was going with this. But I guess you are right: if we already bypass the wrappers, we should adjust the tests accordingly.

I will update the patch.

Cheers,
Matthias

[LTP] [PATCH v2 0/2] sigpending / rt_sigpending

[Matthias Maennich]

Split the `sigpending` test case into rt_sigpending and sigpending, both
bypassing any syscall wrappers.

Obviously these tests are currently only testing a rare corner case and
more thorough testing is needed to cover both of the syscalls. That work
is to be done in a later commit.

Matthias Maennich (2):
  sigpending: use direct syscall
  rt_sigpending: add rt_sigpending02 test case

 runtest/syscalls                              |  1 +
 .../kernel/syscalls/rt_sigpending/.gitignore  |  1 +
 .../kernel/syscalls/rt_sigpending/Makefile    | 23 +++++++++
 .../syscalls/rt_sigpending/rt_sigpending02.c  | 48 +++++++++++++++++++
 .../kernel/syscalls/sigpending/sigpending02.c |  3 +-
 5 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 testcases/kernel/syscalls/rt_sigpending/.gitignore
 create mode 100644 testcases/kernel/syscalls/rt_sigpending/Makefile
 create mode 100644 testcases/kernel/syscalls/rt_sigpending/rt_sigpending02.c

-- 
2.20.1.791.gb4d0f1c61a-goog

[LTP] [PATCH v2 1/2] sigpending: use direct syscall

[Matthias Maennich]

Expand coverage to the Android platform.

Signed-off-by: Matthias Maennich <maennich@google.com>
---
 testcases/kernel/syscalls/sigpending/sigpending02.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testcases/kernel/syscalls/sigpending/sigpending02.c b/testcases/kernel/syscalls/sigpending/sigpending02.c
index a38157ae1..e7ec0d681 100644
--- a/testcases/kernel/syscalls/sigpending/sigpending02.c
+++ b/testcases/kernel/syscalls/sigpending/sigpending02.c
@@ -17,13 +17,14 @@
 #include <sys/types.h>
 
 #include "tst_test.h"
+#include "lapi/syscalls.h"
 
 static void run(void)
 {
 	/* set sigset to point to an invalid location */
 	sigset_t *sigset = (sigset_t *) - 1;
 
-	TEST(sigpending(sigset));
+	TEST(tst_syscall(__NR_sigpending, sigset));
 
 	/* check return code */
 	if (TST_RET == -1) {
-- 
2.20.1.791.gb4d0f1c61a-goog

[LTP] [PATCH v2 2/2] rt_sigpending: add rt_sigpending02 test case

[Matthias Maennich]

This is effectively a copy of the sigpending/sigpending02 test case.
Both of them are now bypassing any syscall wrapper.

Signed-off-by: Matthias Maennich <maennich@google.com>
---
 runtest/syscalls                              |  1 +
 .../kernel/syscalls/rt_sigpending/.gitignore  |  1 +
 .../kernel/syscalls/rt_sigpending/Makefile    | 23 +++++++++
 .../syscalls/rt_sigpending/rt_sigpending02.c  | 48 +++++++++++++++++++
 4 files changed, 73 insertions(+)
 create mode 100644 testcases/kernel/syscalls/rt_sigpending/.gitignore
 create mode 100644 testcases/kernel/syscalls/rt_sigpending/Makefile
 create mode 100644 testcases/kernel/syscalls/rt_sigpending/rt_sigpending02.c

diff --git a/runtest/syscalls b/runtest/syscalls
index 668c87cd1..6280034d0 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -990,6 +990,7 @@ rmdir03A symlink01 -T rmdir03
 rt_sigaction01 rt_sigaction01
 rt_sigaction02 rt_sigaction02
 rt_sigaction03 rt_sigaction03
+rt_sigpending02 rt_sigpending02
 rt_sigprocmask01 rt_sigprocmask01
 rt_sigprocmask02 rt_sigprocmask02
 rt_sigqueueinfo01 rt_sigqueueinfo01
diff --git a/testcases/kernel/syscalls/rt_sigpending/.gitignore b/testcases/kernel/syscalls/rt_sigpending/.gitignore
new file mode 100644
index 000000000..85905fc83
--- /dev/null
+++ b/testcases/kernel/syscalls/rt_sigpending/.gitignore
@@ -0,0 +1 @@
+/rt_sigpending02
diff --git a/testcases/kernel/syscalls/rt_sigpending/Makefile b/testcases/kernel/syscalls/rt_sigpending/Makefile
new file mode 100644
index 000000000..bd617d806
--- /dev/null
+++ b/testcases/kernel/syscalls/rt_sigpending/Makefile
@@ -0,0 +1,23 @@
+#
+#  Copyright (c) International Business Machines  Corp., 2001
+#
+#  This program is free software;  you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY;  without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+#  the GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/rt_sigpending/rt_sigpending02.c b/testcases/kernel/syscalls/rt_sigpending/rt_sigpending02.c
new file mode 100644
index 000000000..06d1c1578
--- /dev/null
+++ b/testcases/kernel/syscalls/rt_sigpending/rt_sigpending02.c
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ *  Copyright (c) International Business Machines  Corp., 2002
+ *
+ * AUTHORS
+ *	Paul Larson
+ *
+ * DESCRIPTION
+ *	Test to see that the proper errors are returned by rt_sigpending
+ *
+ *	Test 1:
+ *		Call rt_sigpending(sigset_t*=-1, SIGSETSIZE),
+ *		it should return -1 with errno EFAULT
+ */
+
+#include <errno.h>
+#include <signal.h>
+#include <sys/types.h>
+
+#include "tst_test.h"
+#include "ltp_signal.h"
+#include "lapi/syscalls.h"
+
+static void run(void)
+{
+	/* set sigset to point to an invalid location */
+	sigset_t *sigset = (sigset_t *) - 1;
+
+	TEST(tst_syscall(__NR_rt_sigpending, sigset, SIGSETSIZE));
+
+	/* check return code */
+	if (TST_RET == -1) {
+		if (TST_ERR != EFAULT) {
+			tst_res(TFAIL | TTERRNO,
+				"rt_sigpending() Failed with wrong errno, "
+				"expected errno=%d, got ", EFAULT);
+		} else {
+			tst_res(TPASS | TTERRNO, "expected failure");
+		}
+	} else {
+		tst_res(TFAIL,
+			"rt_sigpending() Failed, expected return value=-1, got %ld", TST_RET);
+	}
+}
+
+static struct tst_test test = {
+	.test_all = run
+};
-- 
2.20.1.791.gb4d0f1c61a-goog

[LTP] [PATCH v2 1/2] sigpending: use direct syscall

[Steve Muckle]

On 02/12/2019 08:12 AM, 'Matthias Maennich' via kernel-team wrote:
> Expand coverage to the Android platform.
> 
> Signed-off-by: Matthias Maennich <maennich@google.com>
> ---
>   testcases/kernel/syscalls/sigpending/sigpending02.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/testcases/kernel/syscalls/sigpending/sigpending02.c b/testcases/kernel/syscalls/sigpending/sigpending02.c
> index a38157ae1..e7ec0d681 100644
> --- a/testcases/kernel/syscalls/sigpending/sigpending02.c
> +++ b/testcases/kernel/syscalls/sigpending/sigpending02.c
> @@ -17,13 +17,14 @@
>   #include <sys/types.h>
>   
>   #include "tst_test.h"
> +#include "lapi/syscalls.h"
>   
>   static void run(void)
>   {
>   	/* set sigset to point to an invalid location */
>   	sigset_t *sigset = (sigset_t *) - 1;
>   
> -	TEST(sigpending(sigset));
> +	TEST(tst_syscall(__NR_sigpending, sigset));
>   
>   	/* check return code */
>   	if (TST_RET == -1) {
> 

Reviewed-by: Steve Muckle <smuckle@google.com>

[LTP] [PATCH v2 2/2] rt_sigpending: add rt_sigpending02 test case

[Steve Muckle]

On 02/12/2019 08:12 AM, 'Matthias Maennich' via kernel-team wrote:
> This is effectively a copy of the sigpending/sigpending02 test case.
> Both of them are now bypassing any syscall wrapper.
> 
> Signed-off-by: Matthias Maennich <maennich@google.com>
> ---
>   runtest/syscalls                              |  1 +
>   .../kernel/syscalls/rt_sigpending/.gitignore  |  1 +
>   .../kernel/syscalls/rt_sigpending/Makefile    | 23 +++++++++
>   .../syscalls/rt_sigpending/rt_sigpending02.c  | 48 +++++++++++++++++++
>   4 files changed, 73 insertions(+)
>   create mode 100644 testcases/kernel/syscalls/rt_sigpending/.gitignore
>   create mode 100644 testcases/kernel/syscalls/rt_sigpending/Makefile
>   create mode 100644 testcases/kernel/syscalls/rt_sigpending/rt_sigpending02.c

I believe this new test should also be added to runtest/syscalls.

> 
> diff --git a/runtest/syscalls b/runtest/syscalls
> index 668c87cd1..6280034d0 100644
> --- a/runtest/syscalls
> +++ b/runtest/syscalls
> @@ -990,6 +990,7 @@ rmdir03A symlink01 -T rmdir03
>   rt_sigaction01 rt_sigaction01
>   rt_sigaction02 rt_sigaction02
>   rt_sigaction03 rt_sigaction03
> +rt_sigpending02 rt_sigpending02
>   rt_sigprocmask01 rt_sigprocmask01
>   rt_sigprocmask02 rt_sigprocmask02
>   rt_sigqueueinfo01 rt_sigqueueinfo01
> diff --git a/testcases/kernel/syscalls/rt_sigpending/.gitignore b/testcases/kernel/syscalls/rt_sigpending/.gitignore
> new file mode 100644
> index 000000000..85905fc83
> --- /dev/null
> +++ b/testcases/kernel/syscalls/rt_sigpending/.gitignore
> @@ -0,0 +1 @@
> +/rt_sigpending02
> diff --git a/testcases/kernel/syscalls/rt_sigpending/Makefile b/testcases/kernel/syscalls/rt_sigpending/Makefile
> new file mode 100644
> index 000000000..bd617d806
> --- /dev/null
> +++ b/testcases/kernel/syscalls/rt_sigpending/Makefile
> @@ -0,0 +1,23 @@
> +#
> +#  Copyright (c) International Business Machines  Corp., 2001
> +#
> +#  This program is free software;  you can redistribute it and/or modify
> +#  it under the terms of the GNU General Public License as published by
> +#  the Free Software Foundation; either version 2 of the License, or
> +#  (at your option) any later version.
> +#
> +#  This program is distributed in the hope that it will be useful,
> +#  but WITHOUT ANY WARRANTY;  without even the implied warranty of
> +#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
> +#  the GNU General Public License for more details.
> +#
> +#  You should have received a copy of the GNU General Public License
> +#  along with this program;  if not, write to the Free Software
> +#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> +#
> +
> +top_srcdir		?= ../../../..
> +
> +include $(top_srcdir)/include/mk/testcases.mk
> +
> +include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/testcases/kernel/syscalls/rt_sigpending/rt_sigpending02.c b/testcases/kernel/syscalls/rt_sigpending/rt_sigpending02.c
> new file mode 100644
> index 000000000..06d1c1578
> --- /dev/null
> +++ b/testcases/kernel/syscalls/rt_sigpending/rt_sigpending02.c
> @@ -0,0 +1,48 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + *  Copyright (c) International Business Machines  Corp., 2002
> + *
> + * AUTHORS
> + *	Paul Larson
> + *
> + * DESCRIPTION
> + *	Test to see that the proper errors are returned by rt_sigpending
> + *
> + *	Test 1:
> + *		Call rt_sigpending(sigset_t*=-1, SIGSETSIZE),
> + *		it should return -1 with errno EFAULT
> + */
> +
> +#include <errno.h>
> +#include <signal.h>
> +#include <sys/types.h>
> +
> +#include "tst_test.h"
> +#include "ltp_signal.h"
> +#include "lapi/syscalls.h"
> +
> +static void run(void)
> +{
> +	/* set sigset to point to an invalid location */

There are some cleanups that code be made such as removing 
not-necessarily-useful comments like the above, removing unnecessary 
brackets below, etc. But since this patch is just duplicating an 
existing test, maybe it's better to add the test first as is, then 
perhaps a cleanup patch can be done by someone later for both tests?

> +	sigset_t *sigset = (sigset_t *) - 1;
> +
> +	TEST(tst_syscall(__NR_rt_sigpending, sigset, SIGSETSIZE));
> +
> +	/* check return code */
> +	if (TST_RET == -1) {
> +		if (TST_ERR != EFAULT) {
> +			tst_res(TFAIL | TTERRNO,
> +				"rt_sigpending() Failed with wrong errno, "
> +				"expected errno=%d, got ", EFAULT);
> +		} else {
> +			tst_res(TPASS | TTERRNO, "expected failure");
> +		}
> +	} else {
> +		tst_res(TFAIL,
> +			"rt_sigpending() Failed, expected return value=-1, got %ld", TST_RET);
> +	}
> +}
> +
> +static struct tst_test test = {
> +	.test_all = run
> +};
> 

Looks good to me aside from the addition to runtest/syscalls.

cheers,
Steve

[LTP] [PATCH v2 2/2] rt_sigpending: add rt_sigpending02 test case

[Matthias =?unknown-8bit?q?M=C3=A4nnich?=]

Hi!

On 16/02/2019 00:01, Steve Muckle wrote:
> On 02/12/2019 08:12 AM, 'Matthias Maennich' via kernel-team wrote:
>> This is effectively a copy of the sigpending/sigpending02 test case.
>> Both of them are now bypassing any syscall wrapper.
>>
>> Signed-off-by: Matthias Maennich <maennich@google.com>
>> ---
>>   runtest/syscalls                              |  1 +
>>   .../kernel/syscalls/rt_sigpending/.gitignore  |  1 +
>>   .../kernel/syscalls/rt_sigpending/Makefile    | 23 +++++++++
>>   .../syscalls/rt_sigpending/rt_sigpending02.c  | 48 +++++++++++++++++++
>>   4 files changed, 73 insertions(+)
>>   create mode 100644 testcases/kernel/syscalls/rt_sigpending/.gitignore
>>   create mode 100644 testcases/kernel/syscalls/rt_sigpending/Makefile
>>   create mode 100644 
>> testcases/kernel/syscalls/rt_sigpending/rt_sigpending02.c
> 
> I believe this new test should also be added to runtest/syscalls.
> 
>>
>> diff --git a/runtest/syscalls b/runtest/syscalls
>> index 668c87cd1..6280034d0 100644
>> --- a/runtest/syscalls
>> +++ b/runtest/syscalls
>> @@ -990,6 +990,7 @@ rmdir03A symlink01 -T rmdir03
>>   rt_sigaction01 rt_sigaction01
>>   rt_sigaction02 rt_sigaction02
>>   rt_sigaction03 rt_sigaction03
>> +rt_sigpending02 rt_sigpending02
>>   rt_sigprocmask01 rt_sigprocmask01
>>   rt_sigprocmask02 rt_sigprocmask02
>>   rt_sigqueueinfo01 rt_sigqueueinfo01 

I added rt_sigpending02 to runtest/syscalls here. sigpending02 has 
already been there before.

Cheers,
Matthias

[LTP] [PATCH v2 2/2] rt_sigpending: add rt_sigpending02 test case

[Steve Muckle]

On 02/19/2019 06:28 AM, Matthias Männich wrote:
> I added rt_sigpending02 to runtest/syscalls here. sigpending02 has
> already been there before.

Sigh, not sure how I missed that. Sorry for the noise!

Reviewed-by: Steve Muckle <smuckle@google.com>

[LTP] [PATCH v2 2/2] rt_sigpending: add rt_sigpending02 test case

[Petr Vorel]

Hi Matthias, Steve,

> On 02/19/2019 06:28 AM, Matthias Männich wrote:
> > I added rt_sigpending02 to runtest/syscalls here. sigpending02 has
> > already been there before.

> Sigh, not sure how I missed that. Sorry for the noise!

> Reviewed-by: Steve Muckle <smuckle@google.com>

Both commits merged, thanks!

BTW maybe you have noticed ticket about using libc wrapper vs. direct
syscall [1].
Build failure of your commit is caused by our docker image [2]

Kind regards,
Petr

[1] https://github.com/linux-test-project/ltp/issues/506
[2] http://lists.linux.it/pipermail/ltp/2019-March/011050.html