Skip to contentSkip to conversation

syscalls/kill: Small cleanup

PATCH Superseded Ricardo B. Marlière via ltp 2 participants 17 messages May 14, 2025 – May 15, 2025

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover syscalls/kill: Small cleanup

---
Ricardo B. Marlière (6):
syscalls/kill03: Fix test description metadata syscalls/kill05: Fix test description metadata syscalls/kill06: Fix test description metadata syscalls/kill11: Fix test description metadata syscalls/kill09: Convert to new API
syscalls: Remove kill09

 runtest/syscalls                          |   1 -
 testcases/kernel/syscalls/kill/.gitignore |   1 -
 testcases/kernel/syscalls/kill/kill03.c   |  14 ++-
 testcases/kernel/syscalls/kill/kill05.c   |   9 +-
 testcases/kernel/syscalls/kill/kill06.c   |   8 +-
 testcases/kernel/syscalls/kill/kill09.c   | 198 ------------------------------
 testcases/kernel/syscalls/kill/kill11.c   |   9 +-
 7 files changed, 21 insertions(+), 219 deletions(-)

---
base-commit: 4a0e3a8fa7b592958f8e3cd366f63c78fba9f014
change-id: 20250514-conversions-kill-0867fa2c38b1

Best regards,

Signature · 5 lines
Ricardo B. Marlière <[email protected]>


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

PATCH 1/6 syscalls/kill03: Fix test description metadata

From: Ricardo B. Marlière <[email protected]>

---
 testcases/kernel/syscalls/kill/kill03.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
testcases/kernel/syscalls/kill/kill03.c +8 -6
index 7d307067859d45ec64542e2c2b9e897fb6191b25..8d91cc615294c6cbfcc0bcfb8c0d1824da645e35 100644
@@ -1,15 +1,17 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) International Business Machines  Corp., 2001
- *
- * 1) kill() fails with errno set to EINVAL if given an invalid signal.
- * 2) kill() fails with errno set to ESRCH if given a non-existent pid.
- * 3) kill() fails with errno set to ESRCH if the given pid is INT_MIN.
- *
- * HISTORY
  *	07/2001 Ported by Wayne Boyer
  */
 
+/*\
+ * Verify that kill(2) fails with the correct error codes:
+ *
+ * - EINVAL if given an invalid signal.
+ * - ESRCH if given a non-existent pid.
+ * - ESRCH if the given pid is INT_MIN.
+ */
+
 #include <sys/types.h>
 #include <signal.h>
 #include <unistd.h>
Signature · 5 lines
2.49.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
author Reviewed-by Li Wang on v1 1/6
#2 lore raw

Re: [LTP] [PATCH 1/6] syscalls/kill03: Fix test description metadata

Signature · 6 lines
Regards,
Li Wang


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#3 lore raw

PATCH 2/6 syscalls/kill05: Fix test description metadata

In reply to Ricardo B. Marlière via ltp

From: Ricardo B. Marlière <[email protected]>

---
 testcases/kernel/syscalls/kill/kill05.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
testcases/kernel/syscalls/kill/kill05.c +4 -5
index 8ec71be49abcbb072b8744b5dee29da95428a64b..3c317e2fcb08c64531b597be37f39f2f8ab3d416 100644
@@ -2,8 +2,6 @@
 /*
  * Copyright (c) International Business Machines  Corp., 2001
  *
- * Test case to check that kill() fails when passed a pid owned by another user.
- *
  * HISTORY
  *	07/2001 Ported by Wayne Boyer
  *
@@ -12,9 +10,10 @@
  *        segfault in case of error with this syscall).
  *      - Fix deletion of IPC memory segment. Segment was not correctly
  *        deleted due to the change of uid during the test.
- *
- * RESTRICTIONS
- *	This test must be run as root.
+ */
+
+/*\
+ * Test case to check that kill() fails when passed a pid owned by another user.
  */
 
 #include <sys/wait.h>
Signature · 5 lines
2.49.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
author Reviewed-by Li Wang on v1 2/6
#4 lore raw

Re: [LTP] [PATCH 2/6] syscalls/kill05: Fix test description metadata

Signature · 6 lines
Regards,
Li Wang


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#5 lore raw

PATCH 3/6 syscalls/kill06: Fix test description metadata

In reply to Ricardo B. Marlière via ltp

From: Ricardo B. Marlière <[email protected]>

---
 testcases/kernel/syscalls/kill/kill06.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
testcases/kernel/syscalls/kill/kill06.c +4 -4
index 42003a684aecd9aaf975fc3d7e647efd4f5b4ecb..1386e1b773dd1aa609ebb747c66b35e0b0ac80e3 100644
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) International Business Machines  Corp., 2001
- *
+ *	07/2001 Ported by Wayne Boyer
+ */
+
+/*\
  * Test case to check the basic functionality of kill() when killing an
  * entire process group with a negative pid.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
  */
 
 #include <sys/types.h>
Signature · 5 lines
2.49.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
author Reviewed-by Li Wang on v1 3/6
#6 lore raw

Re: [LTP] [PATCH 3/6] syscalls/kill06: Fix test description metadata

Signature · 6 lines
Regards,
Li Wang


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#7 lore raw

PATCH 4/6 syscalls/kill11: Fix test description metadata

In reply to Ricardo B. Marlière via ltp

From: Ricardo B. Marlière <[email protected]>

---
 testcases/kernel/syscalls/kill/kill11.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
testcases/kernel/syscalls/kill/kill11.c +5 -4
index 918f17f22101ee2683f9d90d5a530e2a50403c1b..3cf62feaed777c76d9fd39a48b255bf2da927716 100644
@@ -6,15 +6,16 @@
  *   Copyright (c) International Business Machines  Corp., 2002
  *   Copyright (c) Cyril Hrubis <[email protected]> 2014
  *
- * Test checks that when a child is killed by its parent with sig, it
- * returns the correct values(sig and core dump bit) to the waiting parent.
- *
  * RESTRICTIONS
  * The ulimit for core file size must be greater than 0.
  */
 
+/*\
+ * Test checks that when a child is killed by its parent with sig, it
+ * returns the correct values(sig and core dump bit) to the waiting parent.
+ */
+
 #define _GNU_SOURCE
-#include <errno.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <stdlib.h>
Signature · 5 lines
2.49.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
author Reviewed-by Li Wang on v1 4/6
#8 lore raw

Re: [LTP] [PATCH 4/6] syscalls/kill11: Fix test description metadata

--
Regards,
Li Wang

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#9 lore raw

PATCH 5/6 syscalls/kill09: Convert to new API

In reply to Ricardo B. Marlière via ltp

From: Ricardo B. Marlière <[email protected]>

---
 testcases/kernel/syscalls/kill/kill09.c | 208 ++++----------------------------
 1 file changed, 23 insertions(+), 185 deletions(-)
testcases/kernel/syscalls/kill/kill09.c +23 -185
index c0b70311947754dd08ed48cc88f15eed65a69366..ba12e468de0b918f5470738019adc378076cf293 100644
@@ -1,198 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
  */
-/* $Id: kill09.c,v 1.8 2009/08/28 13:22:51 vapier Exp $ */
-/**********************************************************
- *
- *    OS Test - Silicon Graphics, Inc.
- *
- *    TEST IDENTIFIER	: kill09
- *
- *    EXECUTED BY	: anyone
- *
- *    TEST TITLE	: Basic test for kill(2)
- *
- *    PARENT DOCUMENT	: usctpl01
- *
- *    TEST CASE TOTAL	: 1
- *
- *    WALL CLOCK TIME	: 1
- *
- *    CPU TYPES		: ALL
- *
- *    AUTHOR		: William Roske
- *
- *    CO-PILOT		: Dave Fenner
- *
- *    DATE STARTED	: 03/30/92
- *
- *    INITIAL RELEASE	: UNICOS 7.0
- *
- *    TEST CASES
- *
- * 	1.) kill(2) returns...(See Description)
- *
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- *
- *    OUTPUT SPECIFICATIONS
- *$
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- *
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- *
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- *
- *    INTERCASE DEPENDENCIES
- * 	None
- *
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the kill(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	kill(2).
- *
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- *
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- *
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- *
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
 
-#include <errno.h>
-#include <string.h>
+/*\
+ * Verify that kill(2) works when sending SIGKILL to a child process.
+ */
+
 #include <signal.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "test.h"
-
-void setup();
-void cleanup();
-void alarm_handler(int sig);
-void do_child();
-
-char *TCID = "kill09";
-int TST_TOTAL = 1;
+#include "tst_test.h"
 
-int fork_pid;
-
-int main(int ac, char **av)
+static void run(void)
 {
-	int lc;
 	int status;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		tst_count = 0;
-
-		if ((fork_pid = tst_fork()) == -1)
-			tst_brkm(TBROK | TERRNO, cleanup, "fork failed");
-
-		if (fork_pid == 0) {
-			do_child();
-		}
-
-		TEST(kill(fork_pid, SIGKILL));
-		if (TEST_RETURN == -1)
-			tst_resm(TFAIL | TTERRNO, "kill(.., SIGKILL) failed");
-		else {
-			tst_resm(TPASS,
-				 "kill(%d, SIGKILL) returned %ld",
-				 fork_pid, TEST_RETURN);
-		}
-
-		waitpid(0, &status, WNOHANG);
-
-	}
-
-	cleanup();
-	tst_exit();
+	pid_t pid;
+
+	pid = SAFE_FORK();
+	if (!pid)
+		pause();
+
+	TEST(kill(pid, SIGKILL));
+	if (TST_RET == -1)
+		tst_res(TFAIL | TTERRNO, "kill(.., SIGKILL) failed");
+	else
+		tst_res(TPASS, "kill(%d, SIGKILL) returned %ld", pid, TST_RET);
+	SAFE_WAIT(&status);
 }
 
-void do_child(void)
-{
-	/*
-	 * Setup alarm signal if we don't get the signal to prevent this process
-	 * from hanging around forever.
-	 */
-	signal(SIGALRM, alarm_handler);
-	alarm(20);
-	pause();
-	exit(1);
-}
-
-void setup(void)
-{
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	(void)signal(SIGCHLD, SIG_IGN);
-
-	TEST_PAUSE;
-
-}
-
-void cleanup(void)
-{
-}
-
-void alarm_handler(int sig)
-{
-	exit(8);
-}
+static struct tst_test test = {
+	.test_all = run,
+	.forks_child = 1,
+};
Signature · 5 lines
2.49.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#10 lore raw

Re: [LTP] [PATCH 5/6] syscalls/kill09: Convert to new API

Hi Ricardo,

In this patch, you convert kill09.c to the new API, which is good, but in patch 6/6 you remove kill09.c entirally.

I don't understand why we still need this conversion if we finally need to remove it :).

Signature · 6 lines
Regards,
Li Wang


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#11 lore raw

Re: [LTP] [PATCH 5/6] syscalls/kill09: Convert to new API

Hi Li!

Quoted 7 lines · Li Wang

Hi Ricardo,

In this patch, you convert kill09.c to the new API, which is good, but in patch 6/6 you remove kill09.c entirally.

I don't understand why we still need this conversion if we finally need to remove it :).

Unfortunately it only became apparent that it could be removed entirely after I converted it. So I sent it this way to see if it's acceptable to remove, as its easier to see why. But agreed that it should be squashed, I'll send a v2.

Thanks for reviewing,
- Ricardo.

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#12 lore raw

Re: [LTP] [PATCH 5/6] syscalls/kill09: Convert to new API

Quoted 9 lines · Ricardo B. Marlière

Hi Li!

Quoted 5 lines · Li Wang

Hi Ricardo,

In this patch, you convert kill09.c to the new API, which is good, but in patch 6/6 you remove kill09.c entirally.

Quoted 7 lines
Quoted 2 lines

I don't understand why we still need this conversion if we finally need to remove it :).

Unfortunately it only became apparent that it could be removed entirely after I converted it. So I sent it this way to see if it's acceptable to remove, as its easier to see why. But agreed that it should be squashed, I'll send a v2.

Oh, I see. Thanks for the clarification.
You only need to send the last new patch after squashing.

Signature · 6 lines
Regards,
Li Wang


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#13 lore raw

PATCH 6/6 syscalls: Remove kill09

In reply to Ricardo B. Marlière via ltp

From: Ricardo B. Marlière <[email protected]>

This test case is already covered by kill11.

---
 runtest/syscalls                          |  1 -
 testcases/kernel/syscalls/kill/.gitignore |  1 -
 testcases/kernel/syscalls/kill/kill09.c   | 36 -------------------------------
 3 files changed, 38 deletions(-)
runtest/syscalls +0 -1
index a7ad8837fdad80547dd85527bc8e50bdf381f6e0..e7bc7b27b604e0f0f69b6bad99955662c6c58a91 100644
@@ -699,7 +699,6 @@ kill05 kill05
 kill06 kill06
 kill07 kill07
 kill08 kill08
-kill09 kill09
 kill10 kill10
 kill11 kill11
 kill12 kill12
testcases/kernel/syscalls/kill/.gitignore +0 -1
index 810ed0200072dba7784a0020f91135235a7f291f..8188aa1083d92e25e654b9af32c15a4acbb6ab3d 100644
@@ -4,7 +4,6 @@
 /kill06
 /kill07
 /kill08
-/kill09
 /kill10
 /kill11
 /kill12
testcases/kernel/syscalls/kill/kill09.c deleted +0 -36
deleted file mode 100644
index ba12e468de0b918f5470738019adc378076cf293..0000000000000000000000000000000000000000
@@ -1,36 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- */
-
-/*\
- * Verify that kill(2) works when sending SIGKILL to a child process.
- */
-
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "tst_test.h"
-
-static void run(void)
-{
-	int status;
-	pid_t pid;
-
-	pid = SAFE_FORK();
-	if (!pid)
-		pause();
-
-	TEST(kill(pid, SIGKILL));
-	if (TST_RET == -1)
-		tst_res(TFAIL | TTERRNO, "kill(.., SIGKILL) failed");
-	else
-		tst_res(TPASS, "kill(%d, SIGKILL) returned %ld", pid, TST_RET);
-	SAFE_WAIT(&status);
-}
-
-static struct tst_test test = {
-	.test_all = run,
-	.forks_child = 1,
-};
Signature · 5 lines
2.49.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
author Reviewed-by Li Wang on v1 6/6
#14 lore raw

Re: [LTP] [PATCH 6/6] syscalls: Remove kill09

@Ricard, Maybe combine into 5/6, then looks good.

@Cryil, @petr, this patchset is clean and mostly touches code comments, I think it's safe to have them in the May release.

--
Regards,
Li Wang

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#15 lore raw

Re: [LTP] [PATCH 6/6] syscalls: Remove kill09

Hi!

Quoted 2 lines

@Cryil, @petr, this patchset is clean and mostly touches code comments, I think it's safe to have them in the May release.

I will have a look.

Signature · 5 lines
Cyril Hrubis
[email protected]

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp