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=-10.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, 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 6D82AC4360F for ; Sat, 2 Mar 2019 03:40:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3AF2020838 for ; Sat, 2 Mar 2019 03:40:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Iki/BKuG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727854AbfCBDke (ORCPT ); Fri, 1 Mar 2019 22:40:34 -0500 Received: from mail-oi1-f201.google.com ([209.85.167.201]:37167 "EHLO mail-oi1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727470AbfCBDke (ORCPT ); Fri, 1 Mar 2019 22:40:34 -0500 Received: by mail-oi1-f201.google.com with SMTP id f125so11580604oib.4 for ; Fri, 01 Mar 2019 19:40:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=LnVZcKb8bZZ/YC4iGcJAdmk6TNXedfnEeu/GsipWawU=; b=Iki/BKuGjTgao2jxPggplNg8GPcwFBzvn5X48LXSVHv8DygeOzWPjGXfZE/eFgdAHT yUe7rU5Rs7yVxv+IR3z3Krbe+GOlgkhkVE/thQZ3shKRG0MnroKQNUt7PHZSvj+Qpwzp lJboiJV25dvB3W1E9vA9PB0tw6L57HKjFW80c1ms0npHX6XuptT3RIQkUfMA8KuD20mT RcD2s5D00iWJSWLuqfhHD/nEtQnw0abzfVh+WO7hHsLk/FNi5j01F1hXkUbn3gRrB76e Ws8+DdWC7JIi/6t4wHZvnI7DWZ99Q/GodE7gonyQzgdlqNKRXPUsCPTjvGqsnOqrsnl5 Kctw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=LnVZcKb8bZZ/YC4iGcJAdmk6TNXedfnEeu/GsipWawU=; b=lU5mU8t1IEy706GA8x7AQbjDFfIOTbJ5wQN95eminrAAVcZ5HPho1BrDRoHY08cpwb s53aczSjQP/HspFOuHRUiARO3j4xgMlQm4OGyZAswYahoSlbRhqxLfERFCTM+o+fZT3k zFcLLvqUZjvW1bAL6BN/gdbBrsowkbiE1Crdd0JCvqYnYFaFcTpZ9tfreEG4bcrc4Tqx 9qXmJ/OzpWxy0YP2aO/LvUEG3Kfa8GjU6VAHVmJE/lc/zIicoNSZbR3PKsQA7pLddeXI GDLxVOFhzK9Clp7M1nYmsR1e4X8iRYnbbR4nUjVYwwRtGbeK2k4c7YfhGvp160Vg1B/c QZdA== X-Gm-Message-State: APjAAAWM8ZoO58lSydy2MOHHiXwyubpz/P0eOJPcHijg0uhjkkoS7ri9 WBOKb7SU9VS9kAoHnXG8r6QWA4S3ImjGoyf4C+oroABwtVogigQkKtviTaHIpr0PE6JHXlLnNQD zQm0swzOytorl9lcYVqiFCFkAyEvdmDyDTShQrW1HxuC3xXjNJ5Lltw== X-Google-Smtp-Source: APXvYqx3xmRFQiEDskFwsfUqguAMjFsNjMV1H21pE+WYU5GLKfXCwLUCJoO8aQ8gzzacf8dIL1oq4bI= X-Received: by 2002:a9d:5c0a:: with SMTP id o10mr4824731otk.15.1551498032873; Fri, 01 Mar 2019 19:40:32 -0800 (PST) Date: Fri, 1 Mar 2019 19:40:22 -0800 Message-Id: <20190302034029.96595-1-sdf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.352.gf09ad66450-goog Subject: [PATCH bpf-next v2 0/7] selftests: bpf: break up test_progs 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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Recently we had linux-next bpf/bpf-next conflict when we added new functionality to the test_progs.c at the same location. Let's split test_progs.c the same way we recently split test_verifier.c. I follow the same patten we did in commit 2dfb40121ee8 ("selftests: bpf: prepare for break up of verifier tests") for verifier: create scaffolding to support dedicated files and slowly move the tests into separate files. The first patch adds scaffolding, subsequent patches move progs into separate files. In theory, many of the standalone tests can be migrated to this new framework as well. They get the benefit of common CHECK macro and bpf_find_map function which a lot of standalone tests need to redefine. v3 changes: * respin on top of commit ebace0e981b2 ("selftests/bpf: use __bpf_constant_htons in test_prog.c for flow dissector") * put bpf_rlimit.h into test_progs.c instead of test_progs.h v2 changes: * added cover letter, added more description about file structure Stanislav Fomichev (7): selftests: bpf: break up test_progs - preparations selftests: bpf: break up test_progs - pkt access selftests: bpf: break up test_progs - xdp selftests: bpf: break up test_progs - stackmap selftests: bpf: break up test_progs - tracepoint selftests: bpf: break up test_progs - spinlock selftests: bpf: break up test_progs - misc tools/testing/selftests/bpf/Makefile | 27 +- .../selftests/bpf/prog_tests/.gitignore | 1 + .../selftests/bpf/prog_tests/bpf_obj_id.c | 249 ++ .../selftests/bpf/prog_tests/flow_dissector.c | 72 + .../bpf/prog_tests/get_stack_raw_tp.c | 139 ++ .../selftests/bpf/prog_tests/l4lb_all.c | 90 + .../selftests/bpf/prog_tests/map_lock.c | 75 + .../selftests/bpf/prog_tests/obj_name.c | 71 + .../selftests/bpf/prog_tests/pkt_access.c | 29 + .../selftests/bpf/prog_tests/pkt_md_access.c | 24 + .../selftests/bpf/prog_tests/prog_run_xattr.c | 49 + .../bpf/prog_tests/queue_stack_map.c | 103 + .../bpf/prog_tests/reference_tracking.c | 48 + .../selftests/bpf/prog_tests/signal_pending.c | 48 + .../selftests/bpf/prog_tests/spinlock.c | 29 + .../bpf/prog_tests/stacktrace_build_id.c | 165 ++ .../bpf/prog_tests/stacktrace_build_id_nmi.c | 150 ++ .../selftests/bpf/prog_tests/stacktrace_map.c | 103 + .../bpf/prog_tests/stacktrace_map_raw_tp.c | 59 + .../bpf/prog_tests/task_fd_query_rawtp.c | 78 + .../bpf/prog_tests/task_fd_query_tp.c | 82 + .../selftests/bpf/prog_tests/tcp_estats.c | 19 + .../bpf/prog_tests/tp_attach_query.c | 132 ++ tools/testing/selftests/bpf/prog_tests/xdp.c | 46 + .../bpf/prog_tests/xdp_adjust_tail.c | 31 + .../selftests/bpf/prog_tests/xdp_noinline.c | 82 + tools/testing/selftests/bpf/test_progs.c | 2043 +---------------- tools/testing/selftests/bpf/test_progs.h | 93 + 28 files changed, 2108 insertions(+), 2029 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/.gitignore create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c create mode 100644 tools/testing/selftests/bpf/prog_tests/flow_dissector.c create mode 100644 tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c create mode 100644 tools/testing/selftests/bpf/prog_tests/l4lb_all.c create mode 100644 tools/testing/selftests/bpf/prog_tests/map_lock.c create mode 100644 tools/testing/selftests/bpf/prog_tests/obj_name.c create mode 100644 tools/testing/selftests/bpf/prog_tests/pkt_access.c create mode 100644 tools/testing/selftests/bpf/prog_tests/pkt_md_access.c create mode 100644 tools/testing/selftests/bpf/prog_tests/prog_run_xattr.c create mode 100644 tools/testing/selftests/bpf/prog_tests/queue_stack_map.c create mode 100644 tools/testing/selftests/bpf/prog_tests/reference_tracking.c create mode 100644 tools/testing/selftests/bpf/prog_tests/signal_pending.c create mode 100644 tools/testing/selftests/bpf/prog_tests/spinlock.c create mode 100644 tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c create mode 100644 tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c create mode 100644 tools/testing/selftests/bpf/prog_tests/stacktrace_map.c create mode 100644 tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c create mode 100644 tools/testing/selftests/bpf/prog_tests/task_fd_query_rawtp.c create mode 100644 tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c create mode 100644 tools/testing/selftests/bpf/prog_tests/tcp_estats.c create mode 100644 tools/testing/selftests/bpf/prog_tests/tp_attach_query.c create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp.c create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_noinline.c create mode 100644 tools/testing/selftests/bpf/test_progs.h -- 2.21.0.352.gf09ad66450-goog