Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 27 Apr 2023 21:19:44 +0200
From:   Espen Grindhaug <espen.grindhaug@gmail.com>
To:     Yonghong Song <yhs@meta.com>
Cc:     Andrii Nakryiko <andrii@kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>,
        Stanislav Fomichev <sdf@google.com>,
        Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>,
        Mykola Lysenko <mykolal@fb.com>, Shuah Khan <shuah@kernel.org>,
        bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-kselftest@vger.kernel.org
Subject: Re: [PATCH v2] libbpf: Improve version handling when attaching uprobe
Message-ID: <ZErK0M/qAi/VS8U8@eg>
References: <ZEV/EzOM+TJomP66@eg>
 <07e05c57-feb7-5482-9c07-eb41f976f9fd@meta.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <07e05c57-feb7-5482-9c07-eb41f976f9fd@meta.com>
Precedence: bulk

On Wed, Apr 26, 2023 at 02:47:27PM -0700, Yonghong Song wrote:
>
>
> On 4/23/23 11:55 AM, Espen Grindhaug wrote:
> > This change fixes the handling of versions in elf_find_func_offset.
> > In the previous implementation, we incorrectly assumed that the
>
> Could you give more explanation/example in the commit message
> what does 'incorrectly' mean here? In which situations the
> current libbpf implementation will not be correct?
>

How about something like this?


libbpf: Improve version handling when attaching uprobe

This change fixes the handling of versions in elf_find_func_offset.

For example, let's assume we are trying to attach an uprobe to pthread_create in
glibc. Prior to this commit, it would fail with an error message saying 'elf:
ambiguous match [...]', this is because there are two entries in the symbol
table with that name.

$ nm -D /lib/x86_64-linux-gnu/libc.so.6 | grep pthread_create
0000000000094cc0 T pthread_create@GLIBC_2.2.5
0000000000094cc0 T pthread_create@@GLIBC_2.34

So we go ahead and modify our code to attach to 'pthread_create@@GLIBC_2.34',
and this also fails, but this time with the error 'elf: failed to find symbol
[...]'. This fails because we incorrectly assumed that the version information
would be present in the string found in the string table, but there is only the
string 'pthread_create'.

This patch reworks how we compare the symbol name provided by the user if it is
qualified with a version (using @ or @@). We now look up the correct version
string in the version symbol table before constructing the full name, as also
done above by nm, before comparing.

> > version information would be present in the string found in the
> > string table.
> >
> > We now look up the correct version string in the version symbol
> > table before constructing the full name and then comparing.
> >
> > This patch adds support for both name@version and name@@version to
> > match output of the various elf parsers.
> >
> > Signed-off-by: Espen Grindhaug <espen.grindhaug@gmail.com>
>
> [...]