From patchwork Wed Jun 3 15:34:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Neira X-Patchwork-Id: 218016 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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 73706C433DF for ; Wed, 3 Jun 2020 15:35:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 53AB420738 for ; Wed, 3 Jun 2020 15:35:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rrx0FYIp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726148AbgFCPfH (ORCPT ); Wed, 3 Jun 2020 11:35:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725904AbgFCPfH (ORCPT ); Wed, 3 Jun 2020 11:35:07 -0400 Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A202C08C5C0; Wed, 3 Jun 2020 08:35:07 -0700 (PDT) Received: by mail-qk1-x729.google.com with SMTP id c185so2542954qke.7; Wed, 03 Jun 2020 08:35:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cfzZchf2CkT3aKB4UcrAmgD05hxKKEX8h+moVIiqmNE=; b=rrx0FYIp8cPJ1epF1quhdZ9mmabJBiFDAEb89uGH5Fplvz20e/WeL/lyK3LsNPJgo0 7YVV7FBi/D6seeKO7BllCQc+uiVNz37AVv4i6bAMUCl/dGEIk2MfyyIU6en/ciV9HtDE ZOpwq7l8YGARm5Pg5Bc2u0xObtgDtQETLvGr2aP6RSaftBfL1B2zI2YZRVdGN/3KcY/N HQtxZL8O1OvB1E4eNHzh1N1iHQC4wTV44cM0HQXXU7edvInBA90oEEJCyNpGSCvDJWtQ N0Y/QtsrFatQWH03ZtUVFzNTFv17aHZaFfK0dNTQ8CgYGEk19A8M6YKfOkVoB7pHHf/V k8Ow== 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:mime-version :content-transfer-encoding; bh=cfzZchf2CkT3aKB4UcrAmgD05hxKKEX8h+moVIiqmNE=; b=ikfD1dKpPAZmHvyiEfw14gvSS9yNYmanP6tgDlaDAhXZ/D3mVf6//5v9pl9TJhm96m nepd/pxEvLlFJpr8t0d7upIgkIr2nhVLIqChkD3Dr0atCVKgdDLbDxUzjdYJ4fiXuGHk ViSAJWHfQJGiQtYBafaEjeb8ixRx++Tq692ioWzIOz/75aSwBi2YOLnlsJYOWDPm5QSh Af+9E8g+tey8WSZBF+WAkLRj7DbzhfLsGkbvWFKKktCr6aL72n+UuGqD0GftvhjWVUge OzMdI+qbzlfQ4oKlLCsNtDzd9fbggJZ2x0TEIg3da+DSVfDnHeKWMwrZc1i1iJeSwixx 9rOQ== X-Gm-Message-State: AOAM533Ql6pK6itCSaZ+96jN/gt+nzzCV6l4Sck903CzJrIbx+xnHuS8 xiU8BnukHKdycBM6KgAOLkOyOl9E4/MebA== X-Google-Smtp-Source: ABdhPJw+/ltAs9ChLX46PGhITgoXF52tL9GhKjjbOHfhtuxLs0B202H14uqgZwJLeUeAXSj9YffQbQ== X-Received: by 2002:a37:64c2:: with SMTP id y185mr237060qkb.186.1591198505369; Wed, 03 Jun 2020 08:35:05 -0700 (PDT) Received: from localhost.localdomain (pc-4-149-45-190.cm.vtr.net. [190.45.149.4]) by smtp.googlemail.com with ESMTPSA id h125sm1834574qkd.93.2020.06.03.08.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2020 08:35:04 -0700 (PDT) From: Carlos Neira To: netdev@vger.kernel.org Cc: yhs@fb.com, ebiederm@xmission.com, brouer@redhat.com, bpf@vger.kernel.org, cneirabustos@gmail.com Subject: [PATCH v2 bpf-next] fold test_current_pid_tgid_new_ns into into test_progs Date: Wed, 3 Jun 2020 11:34:46 -0400 Message-Id: <20200603153446.8092-1-cneirabustos@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org folds tests from test_current_pid_tgid_new_ns into test_progs. Signed-off-by: Carlos Neira --- tools/testing/selftests/bpf/Makefile | 3 +- .../bpf/prog_tests/ns_current_pid_tgid.c | 112 +++++++++++- .../bpf/test_current_pid_tgid_new_ns.c | 159 ------------------ 3 files changed, 112 insertions(+), 162 deletions(-) delete mode 100644 tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 22aaec74ea0a..7b2ea7adccb0 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -36,8 +36,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test test_sock test_btf test_sockmap get_cgroup_id_user test_socket_cookie \ test_cgroup_storage \ test_netcnt test_tcpnotify_user test_sock_fields test_sysctl \ - test_progs-no_alu32 \ - test_current_pid_tgid_new_ns + test_progs-no_alu32 # Also test bpf-gcc, if present ifneq ($(BPF_GCC),) diff --git a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c b/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c index e74dc501b27f..f1b6e093f175 100644 --- a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c +++ b/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c @@ -1,10 +1,15 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2020 Carlos Neira cneirabustos@gmail.com */ +#define _GNU_SOURCE #include #include #include #include #include +#include +#include +#include +#include struct bss { __u64 dev; @@ -13,7 +18,7 @@ struct bss { __u64 user_pid_tgid; }; -void test_ns_current_pid_tgid(void) +static void test_ns_current_pid_tgid_global_ns(void) { const char *probe_name = "raw_tracepoint/sys_enter"; const char *file = "test_ns_current_pid_tgid.o"; @@ -83,3 +88,108 @@ void test_ns_current_pid_tgid(void) bpf_link__destroy(link); bpf_object__close(obj); } + +static void test_ns_current_pid_tgid_new_ns(void) +{ + pid_t ppid = getpid(); + int duration = 0; + int pidns_fd = 0; + char nspath[64]; + pid_t pid; + + snprintf(nspath, sizeof(nspath) - 1, "/proc/%d/ns/pid", ppid); + pidns_fd = open(nspath, O_RDONLY); + + if (CHECK(unshare(CLONE_NEWPID), + "unshare CLONE_NEWPID", + "error: %s\n", strerror(errno))) + return; + + pid = vfork(); + if (CHECK(pid < 0, "ns_current_pid_tgid_new_ns", "vfork error: %s\n", + strerror(errno))) { + return; + } + if (pid > 0) { + printf("waiting pid is %u\n", pid); + usleep(5); + wait(NULL); + return; + } else { + const char *probe_name = "raw_tracepoint/sys_enter"; + const char *file = "test_ns_current_pid_tgid.o"; + int err, key = 0, duration = 0; + struct bpf_link *link = NULL; + struct bpf_program *prog; + struct bpf_map *bss_map; + struct bpf_object *obj; + struct bss bss; + struct stat st; + __u64 id; + + obj = bpf_object__open_file(file, NULL); + if (CHECK(IS_ERR(obj), "obj_open", "err %ld\n", PTR_ERR(obj))) + return; + + err = bpf_object__load(obj); + if (CHECK(err, "obj_load", "err %d errno %d\n", err, errno)) + goto cleanup; + + bss_map = bpf_object__find_map_by_name(obj, "test_ns_.bss"); + if (CHECK(!bss_map, "find_bss_map", "failed\n")) + goto cleanup; + + prog = bpf_object__find_program_by_title(obj, probe_name); + if (CHECK(!prog, "find_prog", "prog '%s' not found\n", + probe_name)) + goto cleanup; + + memset(&bss, 0, sizeof(bss)); + pid_t tid = syscall(SYS_gettid); + pid_t pid = getpid(); + + id = (__u64) tid << 32 | pid; + bss.user_pid_tgid = id; + if (CHECK_FAIL(stat("/proc/self/ns/pid", &st))) { + perror("Failed to stat /proc/self/ns/pid"); + goto cleanup; + } + + bss.dev = st.st_dev; + bss.ino = st.st_ino; + + err = bpf_map_update_elem(bpf_map__fd(bss_map), &key, &bss, 0); + if (CHECK(err, "setting_bss", "failed to set bss : %d\n", err)) + goto cleanup; + + link = bpf_program__attach_raw_tracepoint(prog, "sys_enter"); + if (CHECK(IS_ERR(link), "attach_raw_tp", "err %ld\n", + PTR_ERR(link))) { + link = NULL; + goto cleanup; + } + + /* trigger some syscalls */ + usleep(1); + + err = bpf_map_lookup_elem(bpf_map__fd(bss_map), &key, &bss); + if (CHECK(err, "set_bss", "failed to get bss : %d\n", err)) + goto cleanup; + + if (CHECK(id != bss.pid_tgid, "Compare user pid/tgid vs bpf pid/tgid", + "User pid/tgid %llu BPF pid/tgid %llu\n", id, bss.pid_tgid)) + goto cleanup; +cleanup: + setns(pidns_fd, CLONE_NEWPID); + bpf_link__destroy(link); + bpf_object__close(obj); + } +} + +void test_ns_current_pid_tgid(void) +{ + if (test__start_subtest("ns_current_pid_tgid_global_ns")) + test_ns_current_pid_tgid_global_ns(); + if (test__start_subtest("ns_current_pid_tgid_new_ns")) + test_ns_current_pid_tgid_new_ns(); +} diff --git a/tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c b/tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c deleted file mode 100644 index ed253f252cd0..000000000000 --- a/tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c +++ /dev/null @@ -1,159 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright (c) 2020 Carlos Neira cneirabustos@gmail.com */ -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include "test_progs.h" - -#define CHECK_NEWNS(condition, tag, format...) ({ \ - int __ret = !!(condition); \ - if (__ret) { \ - printf("%s:FAIL:%s ", __func__, tag); \ - printf(format); \ - } else { \ - printf("%s:PASS:%s\n", __func__, tag); \ - } \ - __ret; \ -}) - -struct bss { - __u64 dev; - __u64 ino; - __u64 pid_tgid; - __u64 user_pid_tgid; -}; - -int main(int argc, char **argv) -{ - pid_t pid; - int exit_code = 1; - struct stat st; - - printf("Testing bpf_get_ns_current_pid_tgid helper in new ns\n"); - - if (stat("/proc/self/ns/pid", &st)) { - perror("stat failed on /proc/self/ns/pid ns\n"); - printf("%s:FAILED\n", argv[0]); - return exit_code; - } - - if (CHECK_NEWNS(unshare(CLONE_NEWPID | CLONE_NEWNS), - "unshare CLONE_NEWPID | CLONE_NEWNS", "error errno=%d\n", errno)) - return exit_code; - - pid = fork(); - if (pid == -1) { - perror("Fork() failed\n"); - printf("%s:FAILED\n", argv[0]); - return exit_code; - } - - if (pid > 0) { - int status; - - usleep(5); - waitpid(pid, &status, 0); - return 0; - } else { - - pid = fork(); - if (pid == -1) { - perror("Fork() failed\n"); - printf("%s:FAILED\n", argv[0]); - return exit_code; - } - - if (pid > 0) { - int status; - waitpid(pid, &status, 0); - return 0; - } else { - if (CHECK_NEWNS(mount("none", "/proc", NULL, MS_PRIVATE|MS_REC, NULL), - "Unmounting proc", "Cannot umount proc! errno=%d\n", errno)) - return exit_code; - - if (CHECK_NEWNS(mount("proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, NULL), - "Mounting proc", "Cannot mount proc! errno=%d\n", errno)) - return exit_code; - - const char *probe_name = "raw_tracepoint/sys_enter"; - const char *file = "test_ns_current_pid_tgid.o"; - struct bpf_link *link = NULL; - struct bpf_program *prog; - struct bpf_map *bss_map; - struct bpf_object *obj; - int exit_code = 1; - int err, key = 0; - struct bss bss; - struct stat st; - __u64 id; - - obj = bpf_object__open_file(file, NULL); - if (CHECK_NEWNS(IS_ERR(obj), "obj_open", "err %ld\n", PTR_ERR(obj))) - return exit_code; - - err = bpf_object__load(obj); - if (CHECK_NEWNS(err, "obj_load", "err %d errno %d\n", err, errno)) - goto cleanup; - - bss_map = bpf_object__find_map_by_name(obj, "test_ns_.bss"); - if (CHECK_NEWNS(!bss_map, "find_bss_map", "failed\n")) - goto cleanup; - - prog = bpf_object__find_program_by_title(obj, probe_name); - if (CHECK_NEWNS(!prog, "find_prog", "prog '%s' not found\n", - probe_name)) - goto cleanup; - - memset(&bss, 0, sizeof(bss)); - pid_t tid = syscall(SYS_gettid); - pid_t pid = getpid(); - - id = (__u64) tid << 32 | pid; - bss.user_pid_tgid = id; - - if (CHECK_NEWNS(stat("/proc/self/ns/pid", &st), - "stat new ns", "Failed to stat /proc/self/ns/pid errno=%d\n", errno)) - goto cleanup; - - bss.dev = st.st_dev; - bss.ino = st.st_ino; - - err = bpf_map_update_elem(bpf_map__fd(bss_map), &key, &bss, 0); - if (CHECK_NEWNS(err, "setting_bss", "failed to set bss : %d\n", err)) - goto cleanup; - - link = bpf_program__attach_raw_tracepoint(prog, "sys_enter"); - if (CHECK_NEWNS(IS_ERR(link), "attach_raw_tp", "err %ld\n", - PTR_ERR(link))) { - link = NULL; - goto cleanup; - } - - /* trigger some syscalls */ - usleep(1); - - err = bpf_map_lookup_elem(bpf_map__fd(bss_map), &key, &bss); - if (CHECK_NEWNS(err, "set_bss", "failed to get bss : %d\n", err)) - goto cleanup; - - if (CHECK_NEWNS(id != bss.pid_tgid, "Compare user pid/tgid vs. bpf pid/tgid", - "User pid/tgid %llu BPF pid/tgid %llu\n", id, bss.pid_tgid)) - goto cleanup; - - exit_code = 0; - printf("%s:PASS\n", argv[0]); -cleanup: - if (!link) { - bpf_link__destroy(link); - link = NULL; - } - bpf_object__close(obj); - } - } -}