From patchwork Wed Oct 9 16:05:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Kellner X-Patchwork-Id: 11181507 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 67F51912 for ; Wed, 9 Oct 2019 16:09:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49C502190F for ; Wed, 9 Oct 2019 16:09:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731145AbfJIQJp (ORCPT ); Wed, 9 Oct 2019 12:09:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39746 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731798AbfJIQJp (ORCPT ); Wed, 9 Oct 2019 12:09:45 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0C3446671 for ; Wed, 9 Oct 2019 16:09:44 +0000 (UTC) Received: by mail-ed1-f69.google.com with SMTP id d7so1701047edp.23 for ; Wed, 09 Oct 2019 09:09:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nExFoegJ2/EoMxysiNb4UcUHQj6N7PlmnmJooN9YTek=; b=l3Kw4YalsEWLO0rsHCiKt0y08frERO/51rm80YSQbwpv0n4r2AZBCKD5ItHCIJmgC+ C6yY2KTDmMIVPpgNtvFfOxL0KW6iie0uD28nAIORbhq++lAeNzkEN9BDLtsx9HMluD2R UFZCKZLH64bpLSx7NFDx8lMmM5FrEAyvSi0zaPW8uMq3jSRRyX/QweJ502zmYpBWf4Wv oTlLB1r50VBZEMuxw0ixtzXBJv7tMhTEh6bC/4jzohayJ9hIDYuaYCMN4POdybHEc6CS bJ1O8Rmitbpfo+Kg/n86Fq+AMVlf3CHqRrognFau4xVcnuKozlcmf4yWuKeDYvTrDHuL i99w== X-Gm-Message-State: APjAAAX0J6WN1FwXGgwWL0CW6CWsl8leDk5MAdxdivWbuB6h/gR6gZNF Tt/TY147fjHkYVc0UaxtA0xWDMco0sxXUxeFvSuBetd9w1do56qrWSehNkQQNVZQ/qnAtK20HgW /CJI5QrG8Ezo/SlJj+vpAblF3czfX X-Received: by 2002:aa7:de1a:: with SMTP id h26mr3698416edv.289.1570637383259; Wed, 09 Oct 2019 09:09:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqyzjk802/P/MqGMk9Az4c5nwgFsVtqZ8uu5EpijKqMAn0UtKHcHr78cseaDxBfozWoc3IyeZA== X-Received: by 2002:aa7:de1a:: with SMTP id h26mr3698396edv.289.1570637383009; Wed, 09 Oct 2019 09:09:43 -0700 (PDT) Received: from localhost ([2a02:2450:102e:d85:877d:43b4:dd8f:144d]) by smtp.gmail.com with ESMTPSA id h38sm414618edh.13.2019.10.09.09.09.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 09:09:41 -0700 (PDT) From: Christian Kellner To: linux-kernel@vger.kernel.org Cc: linux-api@vger.kernel.org, Christian Kellner , Christian Brauner , Shuah Khan , Andrew Morton , "Peter Zijlstra (Intel)" , Ingo Molnar , Michal Hocko , Thomas Gleixner , Elena Reshetova , Roman Gushchin , Andrea Arcangeli , "Joel Fernandes (Google)" , Al Viro , "Dmitry V. Levin" , linux-kselftest@vger.kernel.org Subject: [PATCH v2 2/2] pidfd: add tests for NSpid info in fdinfo Date: Wed, 9 Oct 2019 18:05:31 +0200 Message-Id: <20191009160532.20674-2-ckellner@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191009160532.20674-1-ckellner@redhat.com> References: <20191008133641.23019-1-ckellner@redhat.com> <20191009160532.20674-1-ckellner@redhat.com> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org From: Christian Kellner Add tests that check that if pid namespaces are configured the fdinfo file of a pidfd contains an NSpid: entry containing the process id in the current and additionally all nested namespaces. Signed-off-by: Christian Kellner --- tools/testing/selftests/pidfd/Makefile | 2 +- tools/testing/selftests/pidfd/pidfd.h | 12 +++ .../selftests/pidfd/pidfd_fdinfo_test.c | 98 +++++++++++++++++++ tools/testing/selftests/pidfd/pidfd_test.c | 12 --- 4 files changed, 111 insertions(+), 13 deletions(-) create mode 100644 tools/testing/selftests/pidfd/pidfd_fdinfo_test.c diff --git a/tools/testing/selftests/pidfd/Makefile b/tools/testing/selftests/pidfd/Makefile index 464c9b76148f..b7784dc488b8 100644 --- a/tools/testing/selftests/pidfd/Makefile +++ b/tools/testing/selftests/pidfd/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only CFLAGS += -g -I../../../../usr/include/ -lpthread -TEST_GEN_PROGS := pidfd_test pidfd_open_test pidfd_poll_test pidfd_wait +TEST_GEN_PROGS := pidfd_test pdfd_fdinfo_test pidfd_open_test pidfd_poll_test pidfd_wait include ../lib.mk diff --git a/tools/testing/selftests/pidfd/pidfd.h b/tools/testing/selftests/pidfd/pidfd.h index c6bc68329f4b..2946d788645b 100644 --- a/tools/testing/selftests/pidfd/pidfd.h +++ b/tools/testing/selftests/pidfd/pidfd.h @@ -84,4 +84,16 @@ static inline int sys_pidfd_send_signal(int pidfd, int sig, siginfo_t *info, return syscall(__NR_pidfd_send_signal, pidfd, sig, info, flags); } +static pid_t pidfd_clone(int flags, int *pidfd, int (*fn)(void *)) +{ + size_t stack_size = 1024; + char *stack[1024] = { 0 }; + +#ifdef __ia64__ + return __clone2(fn, stack, stack_size, flags | SIGCHLD, NULL, pidfd); +#else + return clone(fn, stack + stack_size, flags | SIGCHLD, NULL, pidfd); +#endif +} + #endif /* __PIDFD_H */ diff --git a/tools/testing/selftests/pidfd/pidfd_fdinfo_test.c b/tools/testing/selftests/pidfd/pidfd_fdinfo_test.c new file mode 100644 index 000000000000..fbae502ad8ad --- /dev/null +++ b/tools/testing/selftests/pidfd/pidfd_fdinfo_test.c @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0 + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "pidfd.h" +#include "../kselftest.h" + +static int child_fdinfo_nspid_test(void *args) +{ + ksft_print_msg("Child: pid %d\n", getpid()); + return 0; +} + +static int compare_fdinfo_nspid(int pidfd, char *expect, size_t len) +{ + char path[512]; + FILE *f; + size_t n = 0; + ssize_t k; + char *line = NULL; + int r = -1; + + snprintf(path, sizeof(path), "/proc/self/fdinfo/%d", pidfd); + + f = fopen(path, "re"); + if (!f) + return -1; + + while ((k = getline(&line, &n, f)) != -1) { + if (strncmp(line, "NSpid:", 6)) + continue; + + line[k - 1] = '\0'; + ksft_print_msg("Child: fdinfo NSpid line: '%s'.\n", line); + r = strncmp(line + 6, expect, len); + break; + } + + free(line); + fclose(f); + + return r; +} + +static void test_pidfd_fdinfo_nspid(void) +{ + char expect[512]; + int pid, pidfd = 0; + int n, r; + const char *test_name = "pidfd check for NSpid information in fdinfo"; + + pid = pidfd_clone(CLONE_PIDFD | CLONE_NEWPID | CLONE_NEWUSER, &pidfd, + child_fdinfo_nspid_test); + if (pid < 0) + ksft_exit_fail_msg( + "%s test: pidfd_clone failed (ret %d, errno %d)\n", + test_name, pid, errno); + + ksft_print_msg("Parent: child-pid: %d\n", pid); + + /* The child will have pid 1 in the new pid namespace, + * so the line must be 'NSPid:\t\t1' + */ + n = snprintf(expect, sizeof(expect), "\t%d\t%d", pid, 1); + r = compare_fdinfo_nspid(pidfd, expect, n); + + (void)close(pidfd); + + if (wait_for_pid(pid)) + ksft_exit_fail_msg( + "%s test: waitpid failed (ret %d, errno %d)\n", + test_name, r, errno); + + if (r != 0) + ksft_exit_fail_msg("%s test: Failed\n", test_name); + else + ksft_test_result_pass("%s test: Passed\n", test_name); +} + +int main(int argc, char **argv) +{ + ksft_print_header(); + ksft_set_plan(1); + + test_pidfd_fdinfo_nspid(); + + return ksft_exit_pass(); +} diff --git a/tools/testing/selftests/pidfd/pidfd_test.c b/tools/testing/selftests/pidfd/pidfd_test.c index 7aff2d3b42c0..9cf0b6b3e389 100644 --- a/tools/testing/selftests/pidfd/pidfd_test.c +++ b/tools/testing/selftests/pidfd/pidfd_test.c @@ -27,18 +27,6 @@ #define MAX_EVENTS 5 -static pid_t pidfd_clone(int flags, int *pidfd, int (*fn)(void *)) -{ - size_t stack_size = 1024; - char *stack[1024] = { 0 }; - -#ifdef __ia64__ - return __clone2(fn, stack, stack_size, flags | SIGCHLD, NULL, pidfd); -#else - return clone(fn, stack + stack_size, flags | SIGCHLD, NULL, pidfd); -#endif -} - static int signal_received; static void set_signal_received_on_sigusr1(int sig)