From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB879C17441 for ; Tue, 12 Nov 2019 09:59:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F43721A49 for ; Tue, 12 Nov 2019 09:59:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AIp9XM6q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727046AbfKLJ7D (ORCPT ); Tue, 12 Nov 2019 04:59:03 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54505 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725954AbfKLJ7C (ORCPT ); Tue, 12 Nov 2019 04:59:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573552741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qOgVRn6jHJ6IfSdJ1/JxjuABCvDan9MYScoyUISJE64=; b=AIp9XM6qdA/5Xsx8QGyxPsborX1dSo7ZQdM6Kiaiq+XjODFgd9hTZ5oOWuJVgMbmcV4iad c7a53HQZmmeznPrq9hd+SovQOhyuX/2E2IfDWMJirBO510OwcaKsLHGBpgvJHcb31mE2MY IhDLLb//XXvVgfVuVjicPICzmaSxe3U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-168-i2AvqNiIOS2oXxwrmKLEIA-1; Tue, 12 Nov 2019 04:58:58 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0FEA1803047; Tue, 12 Nov 2019 09:58:56 +0000 (UTC) Received: from dcbz.redhat.com (ovpn-116-65.ams2.redhat.com [10.36.116.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 305DA28D2E; Tue, 12 Nov 2019 09:58:52 +0000 (UTC) From: Adrian Reber To: Christian Brauner , Shuah Khan , Eugene Syromiatnikov , linux-kselftest@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Adrian Reber Subject: [PATCH v4] selftests: add tests for clone3() Date: Tue, 12 Nov 2019 10:58:51 +0100 Message-Id: <20191112095851.811884-1-areber@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: i2AvqNiIOS2oXxwrmKLEIA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This adds tests for clone3() with different values and sizes of struct clone_args. This selftest was initially part of of the clone3() with PID selftest. After that patch was almost merged Eugene sent out a couple of patches to fix problems with these test. This commit now only contains the clone3() selftest after the LPC decision to rework clone3() with PID to allow setting the PID in multiple PID namespaces including all of Eugene's patches. Signed-off-by: Eugene Syromiatnikov Signed-off-by: Adrian Reber --- v2: - Applied Christian's suggestions - Skip root-only tests when running as non-root v3: - Removed unnecessary test case (everything set to 1) - Correctly handle children without SIGCHLD v4: - Small cosmetic fixes - Added two more tests with different sizes --- MAINTAINERS | 1 + tools/testing/selftests/Makefile | 1 + tools/testing/selftests/clone3/.gitignore | 1 + tools/testing/selftests/clone3/Makefile | 7 + tools/testing/selftests/clone3/clone3.c | 205 ++++++++++++++++++++++ 5 files changed, 215 insertions(+) create mode 100644 tools/testing/selftests/clone3/.gitignore create mode 100644 tools/testing/selftests/clone3/Makefile create mode 100644 tools/testing/selftests/clone3/clone3.c diff --git a/MAINTAINERS b/MAINTAINERS index eb19fad370d7..4f4988fbe7b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12833,6 +12833,7 @@ S:=09Maintained T:=09git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git F:=09samples/pidfd/ F:=09tools/testing/selftests/pidfd/ +F:=09tools/testing/selftests/clone3/ K:=09(?i)pidfd K:=09(?i)clone3 K:=09\b(clone_args|kernel_clone_args)\b diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Mak= efile index 4cdbae6f4e61..ad442364218a 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -4,6 +4,7 @@ TARGETS +=3D bpf TARGETS +=3D breakpoints TARGETS +=3D capabilities TARGETS +=3D cgroup +TARGETS +=3D clone3 TARGETS +=3D cpufreq TARGETS +=3D cpu-hotplug TARGETS +=3D drivers/dma-buf diff --git a/tools/testing/selftests/clone3/.gitignore b/tools/testing/self= tests/clone3/.gitignore new file mode 100644 index 000000000000..85d9d3ba2524 --- /dev/null +++ b/tools/testing/selftests/clone3/.gitignore @@ -0,0 +1 @@ +clone3 diff --git a/tools/testing/selftests/clone3/Makefile b/tools/testing/selfte= sts/clone3/Makefile new file mode 100644 index 000000000000..ea922c014ae4 --- /dev/null +++ b/tools/testing/selftests/clone3/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +CFLAGS +=3D -I../../../../usr/include/ + +TEST_GEN_PROGS :=3D clone3 + +include ../lib.mk diff --git a/tools/testing/selftests/clone3/clone3.c b/tools/testing/selfte= sts/clone3/clone3.c new file mode 100644 index 000000000000..0f8a9ef40117 --- /dev/null +++ b/tools/testing/selftests/clone3/clone3.c @@ -0,0 +1,205 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* Based on Christian Brauner's clone3() example */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../kselftest.h" + +/* + * Different sizes of struct clone_args + */ +#ifndef CLONE3_ARGS_SIZE_V0 +#define CLONE3_ARGS_SIZE_V0 64 +#endif + +enum test_mode { +=09CLONE3_ARGS_NO_TEST, +=09CLONE3_ARGS_ALL_0, +=09CLONE3_ARGS_INVAL_EXIT_SIGNAL_BIG, +=09CLONE3_ARGS_INVAL_EXIT_SIGNAL_NEG, +=09CLONE3_ARGS_INVAL_EXIT_SIGNAL_CSIG, +=09CLONE3_ARGS_INVAL_EXIT_SIGNAL_NSIG, +}; + +static pid_t raw_clone(struct clone_args *args, size_t size) +{ +=09return syscall(__NR_clone3, args, size); +} + +static int call_clone3(uint64_t flags, size_t size, enum test_mode test_mo= de) +{ +=09struct clone_args args =3D { +=09=09.flags =3D flags, +=09=09.exit_signal =3D SIGCHLD, +=09}; + +=09struct clone_args_extended { +=09=09struct clone_args args; +=09=09__aligned_u64 excess_space[2]; +=09} args_ext; + +=09pid_t pid =3D -1; +=09int status; + +=09memset(&args_ext, 0, sizeof(args_ext)); +=09if (size > sizeof(struct clone_args)) +=09=09args_ext.excess_space[1] =3D 1; + +=09if (size =3D=3D 0) +=09=09size =3D sizeof(struct clone_args); + +=09switch (test_mode) { +=09case CLONE3_ARGS_ALL_0: +=09=09args.flags =3D 0; +=09=09args.exit_signal =3D 0; +=09=09break; +=09case CLONE3_ARGS_INVAL_EXIT_SIGNAL_BIG: +=09=09args.exit_signal =3D 0xbadc0ded00000000ULL; +=09=09break; +=09case CLONE3_ARGS_INVAL_EXIT_SIGNAL_NEG: +=09=09args.exit_signal =3D 0x0000000080000000ULL; +=09=09break; +=09case CLONE3_ARGS_INVAL_EXIT_SIGNAL_CSIG: +=09=09args.exit_signal =3D 0x0000000000000100ULL; +=09=09break; +=09case CLONE3_ARGS_INVAL_EXIT_SIGNAL_NSIG: +=09=09args.exit_signal =3D 0x00000000000000f0ULL; +=09=09break; +=09} + +=09memcpy(&args_ext.args, &args, sizeof(struct clone_args)); + +=09pid =3D raw_clone((struct clone_args *)&args_ext, size); +=09if (pid < 0) { +=09=09ksft_print_msg("%s - Failed to create new process\n", +=09=09=09=09strerror(errno)); +=09=09return -errno; +=09} + +=09if (pid =3D=3D 0) { +=09=09ksft_print_msg("I am the child, my PID is %d\n", getpid()); +=09=09_exit(EXIT_SUCCESS); +=09} + +=09ksft_print_msg("I am the parent (%d). My child's pid is %d\n", +=09=09=09getpid(), pid); + +=09if (waitpid(-1, &status, __WALL) < 0) { +=09=09ksft_print_msg("Child returned %s\n", strerror(errno)); +=09=09return -errno; +=09} +=09if (WEXITSTATUS(status)) +=09=09return WEXITSTATUS(status); + +=09return 0; +} + +static void test_clone3(uint64_t flags, size_t size, int expected, +=09=09 enum test_mode test_mode) +{ +=09int ret; + +=09ksft_print_msg( +=09=09"[%d] Trying clone3() with flags %#" PRIx64 " (size %zu)\n", +=09=09getpid(), flags, size); +=09ret =3D call_clone3(flags, size, test_mode); +=09ksft_print_msg("[%d] clone3() with flags says: %d expected %d\n", +=09=09=09getpid(), ret, expected); +=09if (ret !=3D expected) +=09=09ksft_test_result_fail( +=09=09=09"[%d] Result (%d) is different than expected (%d)\n", +=09=09=09getpid(), ret, expected); +=09else +=09=09ksft_test_result_pass( +=09=09=09"[%d] Result (%d) matches expectation (%d)\n", +=09=09=09getpid(), ret, expected); +} + +int main(int argc, char *argv[]) +{ +=09pid_t pid; + +=09uid_t uid =3D getuid(); + +=09ksft_print_header(); +=09ksft_set_plan(17); + +=09/* Just a simple clone3() should return 0.*/ +=09test_clone3(0, 0, 0, CLONE3_ARGS_NO_TEST); + +=09/* Do a clone3() in a new PID NS.*/ +=09if (uid =3D=3D 0) +=09=09test_clone3(CLONE_NEWPID, 0, 0, CLONE3_ARGS_NO_TEST); +=09else +=09=09ksft_test_result_skip("Skipping clone3() with CLONE_NEWPID\n"); + +=09/* Do a clone3() with CLONE3_ARGS_SIZE_V0. */ +=09test_clone3(0, CLONE3_ARGS_SIZE_V0, 0, CLONE3_ARGS_NO_TEST); + +=09/* Do a clone3() with CLONE3_ARGS_SIZE_V0 - 8 */ +=09test_clone3(0, CLONE3_ARGS_SIZE_V0 - 8, -EINVAL, CLONE3_ARGS_NO_TEST); + +=09/* Do a clone3() with sizeof(struct clone_args) + 8 */ +=09test_clone3(0, sizeof(struct clone_args) + 8, 0, CLONE3_ARGS_NO_TEST); + +=09/* Do a clone3() with exit_signal having highest 32 bits non-zero */ +=09test_clone3(0, 0, -EINVAL, CLONE3_ARGS_INVAL_EXIT_SIGNAL_BIG); + +=09/* Do a clone3() with negative 32-bit exit_signal */ +=09test_clone3(0, 0, -EINVAL, CLONE3_ARGS_INVAL_EXIT_SIGNAL_NEG); + +=09/* Do a clone3() with exit_signal not fitting into CSIGNAL mask */ +=09test_clone3(0, 0, -EINVAL, CLONE3_ARGS_INVAL_EXIT_SIGNAL_CSIG); + +=09/* Do a clone3() with NSIG < exit_signal < CSIG */ +=09test_clone3(0, 0, -EINVAL, CLONE3_ARGS_INVAL_EXIT_SIGNAL_NSIG); + +=09test_clone3(0, sizeof(struct clone_args) + 8, 0, CLONE3_ARGS_ALL_0); + +=09test_clone3(0, sizeof(struct clone_args) + 16, -E2BIG, +=09=09=09CLONE3_ARGS_ALL_0); + +=09test_clone3(0, sizeof(struct clone_args) * 2, -E2BIG, +=09=09=09CLONE3_ARGS_ALL_0); + +=09/* Do a clone3() with > page size */ +=09test_clone3(0, getpagesize() + 8, -E2BIG, CLONE3_ARGS_NO_TEST); + +=09/* Do a clone3() with CLONE3_ARGS_SIZE_V0 in a new PID NS. */ +=09if (uid =3D=3D 0) +=09=09test_clone3(CLONE_NEWPID, CLONE3_ARGS_SIZE_V0, 0, +=09=09=09=09CLONE3_ARGS_NO_TEST); +=09else +=09=09ksft_test_result_skip("Skipping clone3() with CLONE_NEWPID\n"); + +=09/* Do a clone3() with CLONE3_ARGS_SIZE_V0 - 8 in a new PID NS */ +=09test_clone3(CLONE_NEWPID, CLONE3_ARGS_SIZE_V0 - 8, -EINVAL, +=09=09=09CLONE3_ARGS_NO_TEST); + +=09/* Do a clone3() with sizeof(struct clone_args) + 8 in a new PID NS */ +=09if (uid =3D=3D 0) +=09=09test_clone3(CLONE_NEWPID, sizeof(struct clone_args) + 8, 0, +=09=09=09=09CLONE3_ARGS_NO_TEST); +=09else +=09=09ksft_test_result_skip("Skipping clone3() with CLONE_NEWPID\n"); + +=09/* Do a clone3() with > page size in a new PID NS */ +=09test_clone3(CLONE_NEWPID, getpagesize() + 8, -E2BIG, +=09=09=09CLONE3_ARGS_NO_TEST); + +=09return !ksft_get_fail_cnt() ? ksft_exit_pass() : ksft_exit_fail(); +} --=20 2.23.0