[PATCH bpf-next] kbuild, bpf: Correct pahole version that supports distilled base btf feature

[PATCH bpf-next] kbuild, bpf: Correct pahole version that supports distilled base btf feature

[Pu Lehui]

From: Pu Lehui <pulehui@huawei.com>

pahole commit [0] of supporting distilled base btf feature released on
pahole v1.28 rather than v1.26. So let's correct this.

Link: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=c7b1f6a29ba1 [0]
Signed-off-by: Pu Lehui <pulehui@huawei.com>
---
 scripts/Makefile.btf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
index c3cbeb13de50..fbaaec2187e5 100644
--- a/scripts/Makefile.btf
+++ b/scripts/Makefile.btf
@@ -24,7 +24,7 @@ else
 pahole-flags-$(call test-ge, $(pahole-ver), 126)  = -j$(JOBS) --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func,decl_tag_kfuncs
 
 ifneq ($(KBUILD_EXTMOD),)
-module-pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=distilled_base
+module-pahole-flags-$(call test-ge, $(pahole-ver), 128) += --btf_features=distilled_base
 endif
 
 endif
-- 
2.34.1

Re: [PATCH bpf-next] kbuild, bpf: Correct pahole version that supports distilled base btf feature

[Andrii Nakryiko]

On Tue, Feb 18, 2025 at 10:29 PM Pu Lehui <pulehui@huaweicloud.com> wrote:
>
> From: Pu Lehui <pulehui@huawei.com>
>
> pahole commit [0] of supporting distilled base btf feature released on
> pahole v1.28 rather than v1.26. So let's correct this.
>
> Link: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=c7b1f6a29ba1 [0]
> Signed-off-by: Pu Lehui <pulehui@huawei.com>
> ---
>  scripts/Makefile.btf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
> index c3cbeb13de50..fbaaec2187e5 100644
> --- a/scripts/Makefile.btf
> +++ b/scripts/Makefile.btf
> @@ -24,7 +24,7 @@ else
>  pahole-flags-$(call test-ge, $(pahole-ver), 126)  = -j$(JOBS) --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func,decl_tag_kfuncs
>
>  ifneq ($(KBUILD_EXTMOD),)
> -module-pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=distilled_base
> +module-pahole-flags-$(call test-ge, $(pahole-ver), 128) += --btf_features=distilled_base
>  endif

Alan,

Is this correct? Can you please check and ack? Thanks!

>
>  endif
> --
> 2.34.1
>

Re: [PATCH bpf-next] kbuild, bpf: Correct pahole version that supports distilled base btf feature

[Pu Lehui]

On 2025/2/21 8:30, Andrii Nakryiko wrote:
> On Tue, Feb 18, 2025 at 10:29 PM Pu Lehui <pulehui@huaweicloud.com> wrote:
>>
>> From: Pu Lehui <pulehui@huawei.com>
>>
>> pahole commit [0] of supporting distilled base btf feature released on
>> pahole v1.28 rather than v1.26. So let's correct this.
>>
>> Link: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=c7b1f6a29ba1 [0]
>> Signed-off-by: Pu Lehui <pulehui@huawei.com>
>> ---
>>   scripts/Makefile.btf | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
>> index c3cbeb13de50..fbaaec2187e5 100644
>> --- a/scripts/Makefile.btf
>> +++ b/scripts/Makefile.btf
>> @@ -24,7 +24,7 @@ else
>>   pahole-flags-$(call test-ge, $(pahole-ver), 126)  = -j$(JOBS) --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func,decl_tag_kfuncs
>>
>>   ifneq ($(KBUILD_EXTMOD),)
>> -module-pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=distilled_base
>> +module-pahole-flags-$(call test-ge, $(pahole-ver), 128) += --btf_features=distilled_base
>>   endif
> 
> Alan,
> 
> Is this correct? Can you please check and ack? Thanks!

Maybe Alan doesn't have time to reply at the moment. We can use the 
following command to check that in pahole.git:

$ git name-rev c7b1f6a29ba1
c7b1f6a29ba1 tags/v1.28~73

> 
>>
>>   endif
>> --
>> 2.34.1
>>

Re: [PATCH bpf-next] kbuild, bpf: Correct pahole version that supports distilled base btf feature

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:

On Wed, 19 Feb 2025 06:31:13 +0000 you wrote:
> From: Pu Lehui <pulehui@huawei.com>
> 
> pahole commit [0] of supporting distilled base btf feature released on
> pahole v1.28 rather than v1.26. So let's correct this.
> 
> Link: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=c7b1f6a29ba1 [0]
> Signed-off-by: Pu Lehui <pulehui@huawei.com>
> 
> [...]

Here is the summary with links:
  - [bpf-next] kbuild, bpf: Correct pahole version that supports distilled base btf feature
    https://git.kernel.org/bpf/bpf-next/c/1ffe30efd2f2

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH bpf-next] kbuild, bpf: Correct pahole version that supports distilled base btf feature

[Andrii Nakryiko]

On Mon, Feb 24, 2025 at 4:16 AM Pu Lehui <pulehui@huawei.com> wrote:
>
>
>
> On 2025/2/21 8:30, Andrii Nakryiko wrote:
> > On Tue, Feb 18, 2025 at 10:29 PM Pu Lehui <pulehui@huaweicloud.com> wrote:
> >>
> >> From: Pu Lehui <pulehui@huawei.com>
> >>
> >> pahole commit [0] of supporting distilled base btf feature released on
> >> pahole v1.28 rather than v1.26. So let's correct this.
> >>
> >> Link: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=c7b1f6a29ba1 [0]
> >> Signed-off-by: Pu Lehui <pulehui@huawei.com>
> >> ---
> >>   scripts/Makefile.btf | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
> >> index c3cbeb13de50..fbaaec2187e5 100644
> >> --- a/scripts/Makefile.btf
> >> +++ b/scripts/Makefile.btf
> >> @@ -24,7 +24,7 @@ else
> >>   pahole-flags-$(call test-ge, $(pahole-ver), 126)  = -j$(JOBS) --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func,decl_tag_kfuncs
> >>
> >>   ifneq ($(KBUILD_EXTMOD),)
> >> -module-pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=distilled_base
> >> +module-pahole-flags-$(call test-ge, $(pahole-ver), 128) += --btf_features=distilled_base
> >>   endif
> >
> > Alan,
> >
> > Is this correct? Can you please check and ack? Thanks!
>
> Maybe Alan doesn't have time to reply at the moment. We can use the
> following command to check that in pahole.git:
>
> $ git name-rev c7b1f6a29ba1
> c7b1f6a29ba1 tags/v1.28~73


yep, I was a bit lazy to search for specific commit ;)

I like this command, though:

$ git tag --contains c7b1f6a29ba1
v1.28
v1.29

regardless, applied to bpf-next, thanks

>
> >
> >>
> >>   endif
> >> --
> >> 2.34.1
> >>

Re: [PATCH bpf-next] kbuild, bpf: Correct pahole version that supports distilled base btf feature

[Alan Maguire]

On 24/02/2025 22:24, Andrii Nakryiko wrote:
> On Mon, Feb 24, 2025 at 4:16 AM Pu Lehui <pulehui@huawei.com> wrote:
>>
>>
>>
>> On 2025/2/21 8:30, Andrii Nakryiko wrote:
>>> On Tue, Feb 18, 2025 at 10:29 PM Pu Lehui <pulehui@huaweicloud.com> wrote:
>>>>
>>>> From: Pu Lehui <pulehui@huawei.com>
>>>>
>>>> pahole commit [0] of supporting distilled base btf feature released on
>>>> pahole v1.28 rather than v1.26. So let's correct this.
>>>>
>>>> Link: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=c7b1f6a29ba1 [0]
>>>> Signed-off-by: Pu Lehui <pulehui@huawei.com>
>>>> ---
>>>>   scripts/Makefile.btf | 2 +-
>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
>>>> index c3cbeb13de50..fbaaec2187e5 100644
>>>> --- a/scripts/Makefile.btf
>>>> +++ b/scripts/Makefile.btf
>>>> @@ -24,7 +24,7 @@ else
>>>>   pahole-flags-$(call test-ge, $(pahole-ver), 126)  = -j$(JOBS) --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func,decl_tag_kfuncs
>>>>
>>>>   ifneq ($(KBUILD_EXTMOD),)
>>>> -module-pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=distilled_base
>>>> +module-pahole-flags-$(call test-ge, $(pahole-ver), 128) += --btf_features=distilled_base
>>>>   endif
>>>
>>> Alan,
>>>
>>> Is this correct? Can you please check and ack? Thanks!
>>
>> Maybe Alan doesn't have time to reply at the moment. We can use the
>> following command to check that in pahole.git:
>>
>> $ git name-rev c7b1f6a29ba1
>> c7b1f6a29ba1 tags/v1.28~73
> 
> 
> yep, I was a bit lazy to search for specific commit ;)
> 
> I like this command, though:
> 
> $ git tag --contains c7b1f6a29ba1
> v1.28
> v1.29
> 
> regardless, applied to bpf-next, thanks
> 

Apologies I missed this. The change is perfect - while 1.26 will not
error out for unrecognized features like this, it's better to reflect
that the feature landed in pahole 1.28. Again, thanks for the fix!

Alan