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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0662C6FD19 for ; Mon, 13 Mar 2023 20:41:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229482AbjCMUld (ORCPT ); Mon, 13 Mar 2023 16:41:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbjCMUlc (ORCPT ); Mon, 13 Mar 2023 16:41:32 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59900233C1 for ; Mon, 13 Mar 2023 13:40:59 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id o14so830ioa.3 for ; Mon, 13 Mar 2023 13:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678740054; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=0T+Km9cavSQaDYPpPQXfU9zdS3Tn01gJlo4SYSaGTsQ=; b=TQATrXuUbv73UnY+1AoZezSFrjnoWb6XBb4KKmy55Dz6xoRMZMU5Lk5mVbE/yBcLoS uielXBVD5Xil2P2hsyGwgq3sdGc01SpHIjc9oWqTjvvue5SLYFhijuaVnRJjZY8gDNOh ZTvdnJYkRVLx6HpXv7gMdi7CWdOgEwoykKcbtHLrJZ8A/WwLPpcEoLzGE7malfTUYJjd iSVCqvSgQAD7jOwK0C0ecMYOFtRxx6gjS8WryAOQFoPuQV79KsFJoh8X2QvDhTcPIfs9 qELFz6z7V3giyT7opexr6QgITwDZrGVqYPaijuP+BS4ZDSv/mCQxNh03E+/46usgG7CZ zZrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678740054; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0T+Km9cavSQaDYPpPQXfU9zdS3Tn01gJlo4SYSaGTsQ=; b=QE8bLQp2yhfVj3ojqVzfbJyq9czHQi0ovdzKH0ryOvrU8hRVj28A8kIpjdkdFF4QW9 q94iAE+HbCcn+SjCA/Iy3X1JtU9k9a1OJCoOl13HjjYTTjvq5fRcR54V8uUUgBEbdII7 FXC3j4/ot8yrp1SswU9TB7IkuiP0LKVWcmH/QdpXN5ubAioK5tE9VewCvySlU0mSyGTA 8NcrGuDtcVSNmN17X/V7jq/jvW6P4Wf0ii36DjS4Ux8ozFZ3/lLyhBaoNsdspUuS7Q4P a4fD7CVva5/FHGqN+iNxQ8Tgt+rbFybZXAuNJcAaYAPnRO5S0IIPCOvoc1FT58OXL9Gx R+0w== X-Gm-Message-State: AO0yUKU0D8+QN2mxrppNJCaCLCMTHVzz3O3JzYE4J/2lQbIT6lyNECFg suH+yCNFAEnO8NMFB5oKw0n01A== X-Google-Smtp-Source: AK7set/xW8ytFvQ8KfIVjFvFDObW2b6jVdvNOP69AGFe4AmpmWOEiHtIGspIfm9vNvggXDisP45jHw== X-Received: by 2002:a5e:8819:0:b0:74d:114c:832b with SMTP id l25-20020a5e8819000000b0074d114c832bmr24055572ioj.20.1678740054335; Mon, 13 Mar 2023 13:40:54 -0700 (PDT) Received: from google.com ([2620:15c:183:200:a33c:9b70:2c95:9544]) by smtp.gmail.com with ESMTPSA id h14-20020a0566380f8e00b003c4e3ecb02dsm189549jal.24.2023.03.13.13.40.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 13:40:54 -0700 (PDT) Date: Mon, 13 Mar 2023 14:40:50 -0600 From: Ross Zwisler To: Steven Rostedt Cc: zwisler@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Hao Luo , Jason Gunthorpe , Jiri Olsa , John Fastabend , KP Singh , Leon Romanovsky , Martin KaFai Lau , Mykola Lysenko , Shuah Khan , Song Liu , Stanislav Fomichev , Yonghong Song , linux-kselftest@vger.kernel.org, linux-rdma@vger.kernel.org, linux-trace-kernel@vger.kernel.org, "Michael S . Tsirkin" Subject: Re: [PATCH bpf-next v3 2/2] selftests/bpf: use canonical ftrace path Message-ID: <20230313204050.GA592900@google.com> References: <20230310175209.2130880-1-zwisler@kernel.org> <20230310175209.2130880-2-zwisler@kernel.org> <20230310183352.2943e633@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230310183352.2943e633@gandalf.local.home> Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Fri, Mar 10, 2023 at 06:33:52PM -0500, Steven Rostedt wrote: > On Fri, 10 Mar 2023 10:52:09 -0700 > zwisler@kernel.org wrote: > > > diff --git a/tools/testing/selftests/bpf/get_cgroup_id_user.c b/tools/testing/selftests/bpf/get_cgroup_id_user.c > > index 156743cf5870..4fa61ac8a0ee 100644 > > --- a/tools/testing/selftests/bpf/get_cgroup_id_user.c > > +++ b/tools/testing/selftests/bpf/get_cgroup_id_user.c > > @@ -86,8 +86,12 @@ int main(int argc, char **argv) > > pid = getpid(); > > bpf_map_update_elem(pidmap_fd, &key, &pid, 0); > > > > - snprintf(buf, sizeof(buf), > > - "/sys/kernel/debug/tracing/events/%s/id", probe_name); > > + if (access("/sys/kernel/tracing/trace", F_OK) == 0) > > + snprintf(buf, sizeof(buf), > > + "/sys/kernel/tracing/events/%s/id", probe_name); > > + else > > + snprintf(buf, sizeof(buf), > > + "/sys/kernel/debug/tracing/events/%s/id", probe_name); > > I don't know how the BPF folks feel, but I do know some kernel developers > prefer that if you need to break a single command into multiple lines that > you then need to add brackets around it. As it makes it easier to read. > > if (access("/sys/kernel/tracing/trace", F_OK) == 0) { > snprintf(buf, sizeof(buf), > "/sys/kernel/tracing/events/%s/id", probe_name); > } else { > snprintf(buf, sizeof(buf), > "/sys/kernel/debug/tracing/events/%s/id", probe_name); > } > > > > > efd = open(buf, O_RDONLY, 0); > > if (CHECK(efd < 0, "open", "err %d errno %d\n", efd, errno)) > > goto close_prog; > > diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c > > index 113dba349a57..22be0a9a5a0a 100644 > > --- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c > > +++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c > > @@ -338,7 +338,12 @@ static int get_syms(char ***symsp, size_t *cntp, bool kernel) > > * Filtering out duplicates by using hashmap__add, which won't > > * add existing entry. > > */ > > - f = fopen("/sys/kernel/debug/tracing/available_filter_functions", "r"); > > + > > + if (access("/sys/kernel/tracing/trace", F_OK) == 0) > > + f = fopen("/sys/kernel/tracing/available_filter_functions", "r"); > > + else > > + f = fopen("/sys/kernel/debug/tracing/available_filter_functions", "r"); > > + > > if (!f) > > return -EINVAL; > > > > diff --git a/tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c b/tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c > > index c717741bf8b6..60f92fd3c37a 100644 > > --- a/tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c > > +++ b/tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c > > @@ -17,8 +17,12 @@ static void test_task_fd_query_tp_core(const char *probe_name, > > if (CHECK(err, "bpf_prog_test_load", "err %d errno %d\n", err, errno)) > > goto close_prog; > > > > - snprintf(buf, sizeof(buf), > > - "/sys/kernel/debug/tracing/events/%s/id", probe_name); > > + if (access("/sys/kernel/tracing/trace", F_OK) == 0) > > + snprintf(buf, sizeof(buf), > > + "/sys/kernel/tracing/events/%s/id", probe_name); > > + else > > + snprintf(buf, sizeof(buf), > > + "/sys/kernel/debug/tracing/events/%s/id", probe_name); > > Same here. > > > efd = open(buf, O_RDONLY, 0); > > if (CHECK(efd < 0, "open", "err %d errno %d\n", efd, errno)) > > goto close_prog; > > diff --git a/tools/testing/selftests/bpf/prog_tests/tp_attach_query.c b/tools/testing/selftests/bpf/prog_tests/tp_attach_query.c > > index 770fcc3bb1ba..d3e377fa8e9b 100644 > > --- a/tools/testing/selftests/bpf/prog_tests/tp_attach_query.c > > +++ b/tools/testing/selftests/bpf/prog_tests/tp_attach_query.c > > @@ -16,8 +16,12 @@ void serial_test_tp_attach_query(void) > > for (i = 0; i < num_progs; i++) > > obj[i] = NULL; > > > > - snprintf(buf, sizeof(buf), > > - "/sys/kernel/debug/tracing/events/sched/sched_switch/id"); > > + if (access("/sys/kernel/tracing/trace", F_OK) == 0) > > + snprintf(buf, sizeof(buf), > > + "/sys/kernel/tracing/events/sched/sched_switch/id"); > > + else > > + snprintf(buf, sizeof(buf), > > + "/sys/kernel/debug/tracing/events/sched/sched_switch/id"); > > and here. > > But perhaps the BPF folks don't care? Sure, I agree that this is more readable. I'll gather your Reviewed-by for patch #1, make this change, rebase to the current bpf/bpf-next and send out v4.