From patchwork Mon Jul 8 13:08:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Stancek X-Patchwork-Id: 1129090 X-Patchwork-Delegate: wangli.ahau@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45j5Ph2Ybfz9sPY for ; Mon, 8 Jul 2019 23:09:09 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id A189C3C1C95 for ; Mon, 8 Jul 2019 15:08:58 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [217.194.8.5]) by picard.linux.it (Postfix) with ESMTP id 1C0653C00BE for ; Mon, 8 Jul 2019 15:08:56 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id CC6A7600994 for ; Mon, 8 Jul 2019 15:08:57 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C7FE530C0DE5 for ; Mon, 8 Jul 2019 13:08:53 +0000 (UTC) Received: from dustball.brq.redhat.com (unknown [10.43.17.163]) by smtp.corp.redhat.com (Postfix) with ESMTP id 29F005C22B; Mon, 8 Jul 2019 13:08:53 +0000 (UTC) From: Jan Stancek To: ltp@lists.linux.it, liwan@redhat.com Date: Mon, 8 Jul 2019 15:08:40 +0200 Message-Id: <02ade9af1634c4681156dceecfd51721284044e3.1562591065.git.jstancek@redhat.com> In-Reply-To: <20190705051603.24599-1-liwang@redhat.com> References: <20190705051603.24599-1-liwang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 08 Jul 2019 13:08:53 +0000 (UTC) X-Virus-Scanned: clamav-milter 0.99.2 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_HELO_PASS,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH v3.1] lib: add tst_no_corefile() X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" From: Li Wang Adds a simple helper to avoid corefile dump. If crash is expected in a testcase, we can avoid dumping core file in calling this function. Signed-off-by: Li Wang Cc: Jan Stancek --- Li, I'd like to avoid generating TWARN when user has done nothing wrong. What would you tell on this version? Only tst_no_corefile() is changed compared to your v3. doc/test-writing-guidelines.txt | 12 +++++++-- include/tst_coredump.h | 18 +++++++++++++ include/tst_test.h | 1 + lib/tst_coredump.c | 32 ++++++++++++++++++++++++ testcases/kernel/security/umip/umip_basic_test.c | 2 ++ testcases/kernel/syscalls/ipc/shmat/shmat01.c | 16 +++--------- 6 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 include/tst_coredump.h create mode 100644 lib/tst_coredump.c diff --git a/doc/test-writing-guidelines.txt b/doc/test-writing-guidelines.txt index 4b1e7d25b53f..d9d25c659b34 100644 --- a/doc/test-writing-guidelines.txt +++ b/doc/test-writing-guidelines.txt @@ -826,8 +826,8 @@ The 'TST_PROCESS_STATE_WAIT()' waits until process 'pid' is in requested It's mostly used with state 'S' which means that process is sleeping in kernel for example in 'pause()' or any other blocking syscall. -2.2.10 Signal handlers -^^^^^^^^^^^^^^^^^^^^^^ +2.2.10 Signals and signal handlers +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ If you need to use signal handlers, keep the code short and simple. Don't forget that the signal handler is called asynchronously and can interrupt the @@ -859,6 +859,14 @@ type defined in C99 but this one *DOES NOT* imply 'volatile' (it's just a 'typedef' to 'int'). So the correct type for a flag that is changed from a signal handler is either 'volatile int' or 'volatile sig_atomic_t'. +If a crash (e.g. triggered by signal SIGSEGV) is expected in testing, you +can avoid creation of core files by calling tst_no_corefile() function. +This takes effect for process (and its children) which invoked it, unless +they subsequently modify RLIMIT_CORE. + +Note that LTP library will reap any processes that test didn't reap itself, +and report any non-zero exit code as failure. + 2.2.11 Kernel Modules ^^^^^^^^^^^^^^^^^^^^^ diff --git a/include/tst_coredump.h b/include/tst_coredump.h new file mode 100644 index 000000000000..e1f892544aa8 --- /dev/null +++ b/include/tst_coredump.h @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2019 Red Hat, Inc. + */ + +#ifndef TST_COREDUMP__ +#define TST_COREDUMP__ + +/* + * If crash is expected, avoid dumping corefile. + * 1 is a special value, that disables core-to-pipe. + * At the same time it is small enough value for + * core-to-file, so it skips creating cores as well. + */ +void tst_no_corefile(int verbose); + +#endif /* TST_COREDUMP_H */ + diff --git a/include/tst_test.h b/include/tst_test.h index 2e8e3635204e..b50e88b60666 100644 --- a/include/tst_test.h +++ b/include/tst_test.h @@ -33,6 +33,7 @@ #include "tst_get_bad_addr.h" #include "tst_path_has_mnt_flags.h" #include "tst_sys_conf.h" +#include "tst_coredump.h" /* * Reports testcase result. diff --git a/lib/tst_coredump.c b/lib/tst_coredump.c new file mode 100644 index 000000000000..2cae5771fb8e --- /dev/null +++ b/lib/tst_coredump.c @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2019 Red Hat, Inc. + */ + +#define TST_NO_DEFAULT_MAIN + +#include +#include + +#include "tst_test.h" +#include "tst_coredump.h" + +void tst_no_corefile(int verbose) +{ + struct rlimit new_r, old_r; + + SAFE_GETRLIMIT(RLIMIT_CORE, &old_r); + if (old_r.rlim_max >= 1 || geteuid() == 0) { + /* + * 1 is a special value, that disables core-to-pipe. + * At the same time it is small enough value for + * core-to-file, so it skips creating cores as well. + */ + new_r.rlim_cur = 1; + new_r.rlim_max = 1; + SAFE_SETRLIMIT(RLIMIT_CORE, &new_r); + } + + if (verbose) + tst_res(TINFO, "Avoid dumping corefile for process(pid=%d)", getpid()); +} diff --git a/testcases/kernel/security/umip/umip_basic_test.c b/testcases/kernel/security/umip/umip_basic_test.c index c34d4a1f618d..37850ef9ff71 100644 --- a/testcases/kernel/security/umip/umip_basic_test.c +++ b/testcases/kernel/security/umip/umip_basic_test.c @@ -86,6 +86,8 @@ static void verify_umip_instruction(unsigned int n) pid = SAFE_FORK(); if (pid == 0) { + tst_no_corefile(0); + switch (n) { case 0: asm_sgdt(); diff --git a/testcases/kernel/syscalls/ipc/shmat/shmat01.c b/testcases/kernel/syscalls/ipc/shmat/shmat01.c index aa9dfd4e5baa..f759147994a2 100644 --- a/testcases/kernel/syscalls/ipc/shmat/shmat01.c +++ b/testcases/kernel/syscalls/ipc/shmat/shmat01.c @@ -59,19 +59,9 @@ static void *expected_addr(void *in_addr, void *out_addr) static void do_child(int *in_addr, int expect_crash) { - if (expect_crash) { - /* - * Crash is expected, avoid dumping corefile. - * 1 is a special value, that disables core-to-pipe. - * At the same time it is small enough value for - * core-to-file, so it skips creating cores as well. - */ - struct rlimit r; - - r.rlim_cur = 1; - r.rlim_max = 1; - SAFE_SETRLIMIT(RLIMIT_CORE, &r); - } + if (expect_crash) + tst_no_corefile(1); + *in_addr = 10; exit(0);