MIME-Version: 1.0
References: <20230307032117.3461008-1-irogers@google.com>
In-Reply-To: <20230307032117.3461008-1-irogers@google.com>
From:   Namhyung Kim <namhyung@kernel.org>
Date:   Mon, 6 Mar 2023 20:43:30 -0800
Message-ID: <CAM9d7ci6FWx2oYAbqhVW2-tjB4p8ji3w87n-ndwxidMov+kVZw@mail.gmail.com>
Subject: Re: [PATCH] perf lock contention: Fix builtin detection
To:     Ian Rogers <irogers@google.com>
Cc:     Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Jiri Olsa <jolsa@kernel.org>,
        Martin KaFai Lau <martin.lau@kernel.org>,
        linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
        bpf@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Hi Ian,

On Mon, Mar 6, 2023 at 7:21 PM Ian Rogers <irogers@google.com> wrote:
>
> __has_builtin was passed the macro rather than the actual builtin
> feature.

Oh, I missed it's a macro define in tools/lib/bpf/bpf_core_read.h file.

Looking at some BPF test codes, it seems you also need to check the
clang compiler version.  Please take a look at the file below:

  tools/testing/selftests/bpf/progs/test_core_reloc_type_base.c

Thanks,
Namhyung

>
> Fixes: 1bece1351c65 ("perf lock contention: Support old rw_semaphore type")
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>  tools/perf/util/bpf_skel/lock_contention.bpf.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/bpf_skel/lock_contention.bpf.c b/tools/perf/util/bpf_skel/lock_contention.bpf.c
> index e6007eaeda1a..e422eee0f942 100644
> --- a/tools/perf/util/bpf_skel/lock_contention.bpf.c
> +++ b/tools/perf/util/bpf_skel/lock_contention.bpf.c
> @@ -182,7 +182,7 @@ static inline struct task_struct *get_lock_owner(__u64 lock, __u32 flags)
>                 struct mutex *mutex = (void *)lock;
>                 owner = BPF_CORE_READ(mutex, owner.counter);
>         } else if (flags == LCB_F_READ || flags == LCB_F_WRITE) {
> -#if __has_builtin(bpf_core_type_matches)
> +#if __has_builtin(__builtin_preserve_type_info)
>                 if (bpf_core_type_matches(struct rw_semaphore___old)) {
>                         struct rw_semaphore___old *rwsem = (void *)lock;
>                         owner = (unsigned long)BPF_CORE_READ(rwsem, owner);
> --
> 2.40.0.rc0.216.gc4246ad0f0-goog
>