From patchwork Thu Sep 5 15:27:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1158508 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="Oi+zYOA7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46PPgm4SgCz9s4Y for ; Fri, 6 Sep 2019 01:27:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390411AbfIEP1P (ORCPT ); Thu, 5 Sep 2019 11:27:15 -0400 Received: from mail-ua1-f73.google.com ([209.85.222.73]:43836 "EHLO mail-ua1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388497AbfIEP1P (ORCPT ); Thu, 5 Sep 2019 11:27:15 -0400 Received: by mail-ua1-f73.google.com with SMTP id z26so429041uan.10 for ; Thu, 05 Sep 2019 08:27:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=xm+DwCqYDVAFmaexnNhGuLCoMRRBGDfERnWY7ta2Hdk=; b=Oi+zYOA7np20AWHEV7W6CBSlZhDDh49nfoQtkE9wtbXtkp837VRUzh3g2FoHf6dwpW i3paWJpapHte9YuLIPuraeJj4annAFgvba1OBwXrpGT0NNK26kQwPMkeZmVSfqgitw9f 4HcoOrTb4rc77wRkQeegEauqlTJCuo4Q/+EUdgQqWU9543rGPg41YnMxKdAswzvn+U/J yLZBHasiGSVRKJBg09U3I3+cOjB6cx6Y7j845e+qTcWBa7khchITvnOx9Coe64aNcWbI PTIvchHOojIM/EKqJFiALdYX8MAE1MJbCvN5vQuTlL7eyolO9O8xC+0s4l7/C1NJHPlC IROg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=xm+DwCqYDVAFmaexnNhGuLCoMRRBGDfERnWY7ta2Hdk=; b=Cu8WSwN8LyXzjprZ9fPJkFhtVuUK1nHWHN8q1sxnJ0A9V2sEBMTgeI27jlnAUw5ovC kEetZ3b56iuEjMSsE0tLBq3Xqds6SsDdCOYO92ZKQbRyYjkt/Q+CA/qr6aaKJokJqH5f pp9aQU36ySagVLPe2a5SBSdZDumijpk+U+M/rtlZ4NpqpGcsHZaOg4vzDYRa3uWg06jf C2yRpOMQSKJ98xwkvxSDXv/uc4rF9LFPdHc+ZQFAOMk7r7NomupjunaOiBG4O7r9LNKR DJuCFrjeK7ht1tl5D/QlU1uQ6Dq0If+HJz/ny/2JE0K+sIvdMzhbN4fLT4cAqJHjSmth rp6g== X-Gm-Message-State: APjAAAWnLv+GdJzwhnRekkui4ttnNEwgjwjY1M5lwGm4Fz4bW+cIRC7J lKArXqF1JzNkQGObgPQ79OIHs+aGxRZwlTeM0tZ1JuHZdiZnbDsuU4OTrU1HkujiaWVs2BkCILg HA0hyJhrtPafKn3kV3KzEW9a0SHijrUgamsqmgbXUzmFpQoqWCNTZ3Q== X-Google-Smtp-Source: APXvYqxAC0fXvQlk4s2nrhMYwyk9+AD5ntCoT63A8DQ7mpaoeDu5yiJbZT9hCeCYSuOs8+sm9Nzl3Hk= X-Received: by 2002:ab0:49c6:: with SMTP id f6mr1812653uad.3.1567697233912; Thu, 05 Sep 2019 08:27:13 -0700 (PDT) Date: Thu, 5 Sep 2019 08:27:04 -0700 In-Reply-To: <20190905152709.111193-1-sdf@google.com> Message-Id: <20190905152709.111193-2-sdf@google.com> Mime-Version: 1.0 References: <20190905152709.111193-1-sdf@google.com> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog Subject: [PATCH bpf-next v2 1/6] selftests/bpf: test_progs: add test__join_cgroup helper From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org test__join_cgroup() combines the following operations that usually go hand in hand and returns cgroup fd: * setup cgroup environment (make sure cgroupfs is mounted) * mkdir cgroup * join cgroup It also marks a test as a "cgroup cleanup needed" and removes cgroup state after the test is done. Signed-off-by: Stanislav Fomichev --- tools/testing/selftests/bpf/Makefile | 4 +-- tools/testing/selftests/bpf/test_progs.c | 38 ++++++++++++++++++++++++ tools/testing/selftests/bpf/test_progs.h | 1 + 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index c7595b4ed55d..e145954d3765 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -102,7 +102,7 @@ $(OUTPUT)/test_socket_cookie: cgroup_helpers.c $(OUTPUT)/test_sockmap: cgroup_helpers.c $(OUTPUT)/test_tcpbpf_user: cgroup_helpers.c $(OUTPUT)/test_tcpnotify_user: cgroup_helpers.c trace_helpers.c -$(OUTPUT)/test_progs: trace_helpers.c +$(OUTPUT)/test_progs: cgroup_helpers.c trace_helpers.c $(OUTPUT)/get_cgroup_id_user: cgroup_helpers.c $(OUTPUT)/test_cgroup_storage: cgroup_helpers.c $(OUTPUT)/test_netcnt: cgroup_helpers.c @@ -196,7 +196,7 @@ $(ALU32_BUILD_DIR)/test_progs_32: test_progs.c $(OUTPUT)/libbpf.a\ | $(ALU32_BUILD_DIR) $(CC) $(TEST_PROGS_CFLAGS) $(CFLAGS) \ -o $(ALU32_BUILD_DIR)/test_progs_32 \ - test_progs.c test_stub.c trace_helpers.c prog_tests/*.c \ + test_progs.c test_stub.c cgroup_helpers.c trace_helpers.c prog_tests/*.c \ $(OUTPUT)/libbpf.a $(LDLIBS) $(ALU32_BUILD_DIR)/test_progs_32: $(PROG_TESTS_H) diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index e8616e778cb5..af75a1c7a458 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -2,6 +2,7 @@ /* Copyright (c) 2017 Facebook */ #include "test_progs.h" +#include "cgroup_helpers.h" #include "bpf_rlimit.h" #include #include @@ -17,6 +18,7 @@ struct prog_test_def { int error_cnt; int skip_cnt; bool tested; + bool need_cgroup_cleanup; const char *subtest_name; int subtest_num; @@ -122,6 +124,39 @@ void test__fail(void) env.test->error_cnt++; } +int test__join_cgroup(const char *path) +{ + int fd; + + if (!env.test->need_cgroup_cleanup) { + if (setup_cgroup_environment()) { + fprintf(stderr, + "#%d %s: Failed to setup cgroup environment\n", + env.test->test_num, env.test->test_name); + return -1; + } + + env.test->need_cgroup_cleanup = true; + } + + fd = create_and_get_cgroup(path); + if (fd < 0) { + fprintf(stderr, + "#%d %s: Failed to create cgroup '%s' (errno=%d)\n", + env.test->test_num, env.test->test_name, path, errno); + return fd; + } + + if (join_cgroup(path)) { + fprintf(stderr, + "#%d %s: Failed to join cgroup '%s' (errno=%d)\n", + env.test->test_num, env.test->test_name, path, errno); + return -1; + } + + return fd; +} + struct ipv4_packet pkt_v4 = { .eth.h_proto = __bpf_constant_htons(ETH_P_IP), .iph.ihl = 5, @@ -530,6 +565,9 @@ int main(int argc, char **argv) fprintf(env.stdout, "#%d %s:%s\n", test->test_num, test->test_name, test->error_cnt ? "FAIL" : "OK"); + + if (test->need_cgroup_cleanup) + cleanup_cgroup_environment(); } stdio_restore(); printf("Summary: %d/%d PASSED, %d SKIPPED, %d FAILED\n", diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h index c8edb9464ba6..e518bd5da3e2 100644 --- a/tools/testing/selftests/bpf/test_progs.h +++ b/tools/testing/selftests/bpf/test_progs.h @@ -71,6 +71,7 @@ extern void test__force_log(); extern bool test__start_subtest(const char *name); extern void test__skip(void); extern void test__fail(void); +extern int test__join_cgroup(const char *path); #define MAGIC_BYTES 123