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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable 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 31639C43140 for ; Thu, 5 Sep 2019 15:27:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99A3D206B8 for ; Thu, 5 Sep 2019 15:27:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gVluAko2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390419AbfIEP1S (ORCPT ); Thu, 5 Sep 2019 11:27:18 -0400 Received: from mail-pl1-f202.google.com ([209.85.214.202]:51285 "EHLO mail-pl1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388497AbfIEP1R (ORCPT ); Thu, 5 Sep 2019 11:27:17 -0400 Received: by mail-pl1-f202.google.com with SMTP id j9so1649613plt.18 for ; Thu, 05 Sep 2019 08:27:17 -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=bj3xTPEhTNL/GdpXBmTQIcsjFTPbC6eexVZEhONF5Rc=; b=gVluAko2a/F3Nvstd2Tgbn2vJ3LuQ5zcIg8HCyr3CKxebMMzhLdhz9ipZbHPFzaQaH nhBSSHyoIio375Z7jF8AwkBTeRYu8fYoXvu8ffw8axc0ajO21RJDSkaLb+4Ofjvh30cV 4sQ8TAkgpV7w9pmaYZhrBGxXeSio+3NAgygFBibqYd9oWzeBKd/kYDEFMtLI1t6etTXp kqnv2vibb24J4VO7qArGYbIH/Y4deah667PDvfFQGXZG6COmwBRyXQ5E3aGgNReR4mRM QHlR5y8u7W7BtMJ5V1+2mIX5mT8QERSxZCoGmIn9m2SG3+V7Pe14PHhIDEc4Yrh8hVmx MbKw== 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=bj3xTPEhTNL/GdpXBmTQIcsjFTPbC6eexVZEhONF5Rc=; b=JoSG177oTIlGTZMsqmV5pR6zSimGebQt54pZCUqdHg7XqFsIlwSIh8/LkZAUmWFTHs 8PpqlCWHeS5CUu6ILWU9fPaB/jYndAPCtniZrNnfac2A+e0Pey7zjK7IJJcBxNStGDev 72bw1CBhN4jskOhzniPJbK3+bJexuKRYMYNyeL6xU0iO1KBniEIwGh1m+m7N1BZ7zOCn pH3DSmgOLdO8QdMhE9uDf5wvnDFr22GVPjE1l2hJfmeQbTx1JjAdCgJsaBAnoEihQxUJ YqyPTF/Obzh4USibHqR10zN+AX7pxwbhcBBunxJM+3f0OGt6DfXizwaZJS2NN67JFhGY T4Tw== X-Gm-Message-State: APjAAAW3T0w6EiGFhH4EsvdqnBYs7WCZVGjQ2GmpVfxlV508t5usTXuA +bYzyWcIDmMkqPLCnPpEt7xeEQ8= X-Google-Smtp-Source: APXvYqyfrHAthA0CDE+zTEexx3zhUbqwQ6vy3mtZ675LFmKAm7PW+ioig4IqJgxkqpJ2Gg/lhRFwAMs= X-Received: by 2002:a65:464d:: with SMTP id k13mr3309155pgr.99.1567697236440; Thu, 05 Sep 2019 08:27:16 -0700 (PDT) Date: Thu, 5 Sep 2019 08:27:05 -0700 In-Reply-To: <20190905152709.111193-1-sdf@google.com> Message-Id: <20190905152709.111193-3-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 2/6] selftests/bpf: test_progs: convert test_sockopt From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Content-Type: text/plain; charset="UTF-8" Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Move the files, adjust includes, remove entry from Makefile & .gitignore Signed-off-by: Stanislav Fomichev --- tools/testing/selftests/bpf/.gitignore | 1 - tools/testing/selftests/bpf/Makefile | 3 +- .../{test_sockopt.c => prog_tests/sockopt.c} | 50 +++---------------- 3 files changed, 8 insertions(+), 46 deletions(-) rename tools/testing/selftests/bpf/{test_sockopt.c => prog_tests/sockopt.c} (96%) diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore index 60c9338cd9b4..0315120eac8f 100644 --- a/tools/testing/selftests/bpf/.gitignore +++ b/tools/testing/selftests/bpf/.gitignore @@ -39,7 +39,6 @@ libbpf.so.* test_hashmap test_btf_dump xdping -test_sockopt test_sockopt_sk test_sockopt_multi test_sockopt_inherit diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index e145954d3765..08e2183974d5 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -28,7 +28,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_select_reuseport test_section_names \ test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \ - test_btf_dump test_cgroup_attach xdping test_sockopt test_sockopt_sk \ + test_btf_dump test_cgroup_attach xdping test_sockopt_sk \ test_sockopt_multi test_sockopt_inherit test_tcp_rtt BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c))) @@ -109,7 +109,6 @@ $(OUTPUT)/test_netcnt: cgroup_helpers.c $(OUTPUT)/test_sock_fields: cgroup_helpers.c $(OUTPUT)/test_sysctl: cgroup_helpers.c $(OUTPUT)/test_cgroup_attach: cgroup_helpers.c -$(OUTPUT)/test_sockopt: cgroup_helpers.c $(OUTPUT)/test_sockopt_sk: cgroup_helpers.c $(OUTPUT)/test_sockopt_multi: cgroup_helpers.c $(OUTPUT)/test_sockopt_inherit: cgroup_helpers.c diff --git a/tools/testing/selftests/bpf/test_sockopt.c b/tools/testing/selftests/bpf/prog_tests/sockopt.c similarity index 96% rename from tools/testing/selftests/bpf/test_sockopt.c rename to tools/testing/selftests/bpf/prog_tests/sockopt.c index 23bd0819382d..64cffb94307c 100644 --- a/tools/testing/selftests/bpf/test_sockopt.c +++ b/tools/testing/selftests/bpf/prog_tests/sockopt.c @@ -1,22 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "bpf_rlimit.h" -#include "bpf_util.h" +#include #include "cgroup_helpers.h" -#define CG_PATH "/sockopt" - static char bpf_log_buf[4096]; static bool verbose; @@ -983,39 +968,18 @@ static int run_test(int cgroup_fd, struct sockopt_test *test) return ret; } -int main(int args, char **argv) +void test_sockopt(void) { - int err = EXIT_FAILURE, error_cnt = 0; int cgroup_fd, i; - if (setup_cgroup_environment()) - goto cleanup_obj; - - cgroup_fd = create_and_get_cgroup(CG_PATH); - if (cgroup_fd < 0) - goto cleanup_cgroup_env; - - if (join_cgroup(CG_PATH)) - goto cleanup_cgroup; + cgroup_fd = test__join_cgroup("/sockopt"); + if (CHECK_FAIL(cgroup_fd < 0)) + return; for (i = 0; i < ARRAY_SIZE(tests); i++) { - int err = run_test(cgroup_fd, &tests[i]); - - if (err) - error_cnt++; - - printf("#%d %s: %s\n", i, err ? "FAIL" : "PASS", - tests[i].descr); + printf("#%d %s:\n", i, tests[i].descr); + CHECK_FAIL(run_test(cgroup_fd, &tests[i])); } - printf("Summary: %ld PASSED, %d FAILED\n", - ARRAY_SIZE(tests) - error_cnt, error_cnt); - err = error_cnt ? EXIT_FAILURE : EXIT_SUCCESS; - -cleanup_cgroup: close(cgroup_fd); -cleanup_cgroup_env: - cleanup_cgroup_environment(); -cleanup_obj: - return err; } -- 2.23.0.187.g17f5b7556c-goog