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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 464EDC5519F for ; Wed, 18 Nov 2020 01:59:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D6D6F20B80 for ; Wed, 18 Nov 2020 01:59:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="A+v4rQPb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726215AbgKRB6g (ORCPT ); Tue, 17 Nov 2020 20:58:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726146AbgKRB6f (ORCPT ); Tue, 17 Nov 2020 20:58:35 -0500 Received: from mail-yb1-xb42.google.com (mail-yb1-xb42.google.com [IPv6:2607:f8b0:4864:20::b42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99C76C061A48; Tue, 17 Nov 2020 17:58:35 -0800 (PST) Received: by mail-yb1-xb42.google.com with SMTP id l14so188821ybq.3; Tue, 17 Nov 2020 17:58:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=i95B+mcKwKcEEFXnIfJJSp56iC1ORoijGOfO3BXCsac=; b=A+v4rQPbqcF4+Kqaetq1y22nkQtpMI9hKC4Nu2KUVJhwnVYZCJCko2LwlrzkwQQzn7 ezWFc4VrvdF0yJ2i9jx1vBxaJjH+7HzKVVBSEo/xcIQpEj6nVkii2IQduVTz4caJxWDS eVIv3YhW0ys3VtQT/FPAPY7Bw72Tw82o9NjN6jt+2vIdGKQMYov4TNUPLZu92Z9PG/Ky JmsWbeh+YkQpmHjJnjemyDNO0Xyj2bTaZxC3oVPQV2aZkGaqQ/6oTvMKT3g62OYypCJK k3GlRN9BYCI3/V9sVUg3tz2rlDqBiI5KUFVdXZcTDZT1m1DF+0dyWfEH+RiAD8bqrVqs T2dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=i95B+mcKwKcEEFXnIfJJSp56iC1ORoijGOfO3BXCsac=; b=Os7nnqW2r4ywefVyryH5IxyD3anG/+714XMNPXBZqhJ0NYoS5t+7hGeHhoLzQa0w+h Rskprz0w05hs8Mxz62v9Dp1hoVXDz8Gym9oPKwIiytPfUwuE7Z7C/0ZIQNmVgoIWLKBS eiu2WC7267hjJ4MEknnR61SMNM884mRV5Im+HYeL7Ucp03KupqThZBDRGNIODk/4CaEs 3F0EBHnd3ZmcJsZDOAjkb5xtD7vJqu0LDluHmFsJB/LrI8bkJkqXYjZk+KpC/EbkdYXQ TfCm7IxOxfCOK6PUpURufu1B6hcVaqcxhlncLXotWE0tqnvUtXCcxzmW4OLixfXTDp3U dfKA== X-Gm-Message-State: AOAM531JyOxv2/N/VAB2hvp9L/QJivNp3YgPTxT/Zrm8wcGi9GsH+lus 50RbrtsG79P/zhLwUumjAqEqaxwFs4AQplgmUuM= X-Google-Smtp-Source: ABdhPJz6gkSRtuwtVrhHeY4jdhDED9ojz3+uBYSrOJOcNAH50SfDVucHd4OO9rk6QrxzwmDxuWhUQWy/7Xh4oNjvQg0= X-Received: by 2002:a25:3d7:: with SMTP id 206mr3669464ybd.27.1605664714910; Tue, 17 Nov 2020 17:58:34 -0800 (PST) MIME-Version: 1.0 References: <20201117145644.1166255-1-danieltimlee@gmail.com> <20201117145644.1166255-2-danieltimlee@gmail.com> In-Reply-To: <20201117145644.1166255-2-danieltimlee@gmail.com> From: Andrii Nakryiko Date: Tue, 17 Nov 2020 17:58:24 -0800 Message-ID: Subject: Re: [PATCH bpf-next 1/9] selftests: bpf: move tracing helpers to trace_helper To: "Daniel T. Lee" Cc: Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , brakmo , Jesper Dangaard Brouer , Lorenzo Bianconi , David Ahern , Yonghong Song , =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= , Ira Weiny , Thomas Graf , Jakub Kicinski , Martin KaFai Lau , John Fastabend , bpf , Networking , Xdp Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: xdp-newbies@vger.kernel.org On Tue, Nov 17, 2020 at 6:57 AM Daniel T. Lee wrote: > > Under the samples/bpf directory, similar tracing helpers are > fragmented around. To keep consistent of tracing programs, this commit > moves the helper and define locations to increase the reuse of each > helper function. > > Signed-off-by: Daniel T. Lee > > --- > samples/bpf/Makefile | 2 +- > samples/bpf/hbm.c | 51 ++++----------------- > tools/testing/selftests/bpf/trace_helpers.c | 33 ++++++++++++- > tools/testing/selftests/bpf/trace_helpers.h | 3 ++ > 4 files changed, 45 insertions(+), 44 deletions(-) > > diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile > index aeebf5d12f32..3e83cd5ca1c2 100644 > --- a/samples/bpf/Makefile > +++ b/samples/bpf/Makefile > @@ -110,7 +110,7 @@ xdp_fwd-objs := xdp_fwd_user.o > task_fd_query-objs := bpf_load.o task_fd_query_user.o $(TRACE_HELPERS) > xdp_sample_pkts-objs := xdp_sample_pkts_user.o $(TRACE_HELPERS) > ibumad-objs := bpf_load.o ibumad_user.o $(TRACE_HELPERS) > -hbm-objs := bpf_load.o hbm.o $(CGROUP_HELPERS) > +hbm-objs := bpf_load.o hbm.o $(CGROUP_HELPERS) $(TRACE_HELPERS) > > # Tell kbuild to always build the programs > always-y := $(tprogs-y) > diff --git a/samples/bpf/hbm.c b/samples/bpf/hbm.c > index 400e741a56eb..b9f9f771dd81 100644 > --- a/samples/bpf/hbm.c > +++ b/samples/bpf/hbm.c > @@ -48,6 +48,7 @@ > > #include "bpf_load.h" > #include "bpf_rlimit.h" > +#include "trace_helpers.h" > #include "cgroup_helpers.h" > #include "hbm.h" > #include "bpf_util.h" > @@ -65,51 +66,12 @@ bool no_cn_flag; > bool edt_flag; > > static void Usage(void); > -static void read_trace_pipe2(void); > static void do_error(char *msg, bool errno_flag); > > -#define DEBUGFS "/sys/kernel/debug/tracing/" > - > struct bpf_object *obj; > int bpfprog_fd; > int cgroup_storage_fd; > > -static void read_trace_pipe2(void) This is used only in hbm.c, why move it into trace_helpers.c? > -{ > - int trace_fd; > - FILE *outf; > - char *outFname = "hbm_out.log"; > - [...]