diff mbox series

[bpf-next] kbuild, bpf: reproducible BTF from pahole when KBUILD_BUILD_TIMESTAMP set

Message ID 20240701173133.3283312-1-alan.maguire@oracle.com (mailing list archive)
State Changes Requested
Delegated to: BPF
Headers show
Series [bpf-next] kbuild, bpf: reproducible BTF from pahole when KBUILD_BUILD_TIMESTAMP set | expand

Checks

Context Check Description
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for bpf-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 8 this patch: 8
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 17 of 17 maintainers
netdev/build_clang success Errors and warnings before: 8 this patch: 8
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 8 this patch: 8
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 10 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-next-PR success PR summary
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-12 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-11 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for s390x-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-18 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-19 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-42 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-13 success Logs for s390x-gcc / test (test_maps, false, 360) / test_maps on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-7 success Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-8 success Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-15 success Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-22 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-14 success Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-32 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-gcc / veristat / veristat on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-26 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-31 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-40 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-39 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-38 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18

Commit Message

Alan Maguire July 1, 2024, 5:31 p.m. UTC 
Reproducible builds [1] require that the same source code with
the same set of tools can build identical objects each time,
but pahole in parallel mode was non-deterministic in
BTF generation prior to

dba7b5e ("pahole: Encode BTF serially in a reproducible build")

This was a problem since said BTF is baked into kernels and modules in
.BTF sections, so parallel pahole was causing non-reproducible binary
generation.  Now with the above commit we have support for parallel
reproducible BTF generation in pahole.

KBUILD_BUILD_TIMESTAMP is set for reproducible builds, so if it
is set, add reproducible_build to --btf_features.

[1] Documentation/kbuild/reproducible-builds.rst

Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
---
 scripts/Makefile.btf | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Jiri Olsa July 1, 2024, 11:07 p.m. UTC | #1 
On Mon, Jul 01, 2024 at 06:31:33PM +0100, Alan Maguire wrote:
> Reproducible builds [1] require that the same source code with
> the same set of tools can build identical objects each time,
> but pahole in parallel mode was non-deterministic in
> BTF generation prior to
> 
> dba7b5e ("pahole: Encode BTF serially in a reproducible build")
> 
> This was a problem since said BTF is baked into kernels and modules in
> .BTF sections, so parallel pahole was causing non-reproducible binary
> generation.  Now with the above commit we have support for parallel
> reproducible BTF generation in pahole.
> 
> KBUILD_BUILD_TIMESTAMP is set for reproducible builds, so if it
> is set, add reproducible_build to --btf_features.
> 
> [1] Documentation/kbuild/reproducible-builds.rst
> 
> Signed-off-by: Alan Maguire <alan.maguire@oracle.com>

makes sense

Acked-by: Jiri Olsa <jolsa@kernel.org>

jirka

> ---
>  scripts/Makefile.btf | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
> index b75f09f3f424..40bb72662967 100644
> --- a/scripts/Makefile.btf
> +++ b/scripts/Makefile.btf
> @@ -21,6 +21,10 @@ else
>  # Switch to using --btf_features for v1.26 and later.
>  pahole-flags-$(call test-ge, $(pahole-ver), 126)  = -j --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func,decl_tag_kfuncs
>  
> +ifneq ($(KBUILD_BUILD_TIMESTAMP),)
> +pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=reproducible_build
> +endif
> +
>  ifneq ($(KBUILD_EXTMOD),)
>  module-pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=distilled_base
>  endif
> -- 
> 2.31.1
>
Masahiro Yamada July 2, 2024, 7:58 a.m. UTC | #2 
On Tue, Jul 2, 2024 at 2:32 AM Alan Maguire <alan.maguire@oracle.com> wrote:
>
> Reproducible builds [1] require that the same source code with
> the same set of tools can build identical objects each time,
> but pahole in parallel mode was non-deterministic in
> BTF generation prior to
>
> dba7b5e ("pahole: Encode BTF serially in a reproducible build")
>
> This was a problem since said BTF is baked into kernels and modules in
> .BTF sections, so parallel pahole was causing non-reproducible binary
> generation.  Now with the above commit we have support for parallel
> reproducible BTF generation in pahole.
>
> KBUILD_BUILD_TIMESTAMP is set for reproducible builds, so if it
> is set, add reproducible_build to --btf_features.
>
> [1] Documentation/kbuild/reproducible-builds.rst
>
> Signed-off-by: Alan Maguire <alan.maguire@oracle.com>




Does not make sense.



KBUILD_BUILD_TIMESTAMP is not a switch for
"please enable the reproducible build".


KBUILD_BUILD_TIMESTAMP requires the build code
to use the given time in the output where timestamps are used.

Your patch does not use the timestamp at all.


If --btf_features=reproducible_build has no downside,
please add it whenever supported.







> ---
>  scripts/Makefile.btf | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
> index b75f09f3f424..40bb72662967 100644
> --- a/scripts/Makefile.btf
> +++ b/scripts/Makefile.btf
> @@ -21,6 +21,10 @@ else
>  # Switch to using --btf_features for v1.26 and later.
>  pahole-flags-$(call test-ge, $(pahole-ver), 126)  = -j --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func,decl_tag_kfuncs
>
> +ifneq ($(KBUILD_BUILD_TIMESTAMP),)
> +pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=reproducible_build
> +endif
> +
>  ifneq ($(KBUILD_EXTMOD),)
>  module-pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=distilled_base
>  endif
> --
> 2.31.1
>
Dominique Martinet July 2, 2024, 8:20 a.m. UTC | #3 
Masahiro Yamada wrote on Tue, Jul 02, 2024 at 04:58:50PM +0900:
> If --btf_features=reproducible_build has no downside,
> please add it whenever supported.

It makes the build slightly slower (from [1], 3.858 -> 3.991 (+3%) on
my crippled machine for the vmlinux BTF phase -- the modules also get
similar treatment, I'm not sure how big the total time exactly is --
for large kernels with tons of modules it definitely adds up but for small
kernels it's probably "short enough")

[1] https://lkml.kernel.org/r/20240626032253.3406460-1-asmadeus@codewreck.org


I don't particularly mind either way, so this is mostly out of curiosity:
do we have any other setting that would be closer better than this
KBUILD_BUILD_TIMESTAMP to say "make this reproducible", or is the kernel
build supposed to be reproducible except for the date by default?


Thank you,
Alan Maguire July 2, 2024, 9:49 a.m. UTC | #4 
On 02/07/2024 08:58, Masahiro Yamada wrote:
> On Tue, Jul 2, 2024 at 2:32 AM Alan Maguire <alan.maguire@oracle.com> wrote:
>>
>> Reproducible builds [1] require that the same source code with
>> the same set of tools can build identical objects each time,
>> but pahole in parallel mode was non-deterministic in
>> BTF generation prior to
>>
>> dba7b5e ("pahole: Encode BTF serially in a reproducible build")
>>
>> This was a problem since said BTF is baked into kernels and modules in
>> .BTF sections, so parallel pahole was causing non-reproducible binary
>> generation.  Now with the above commit we have support for parallel
>> reproducible BTF generation in pahole.
>>
>> KBUILD_BUILD_TIMESTAMP is set for reproducible builds, so if it
>> is set, add reproducible_build to --btf_features.
>>
>> [1] Documentation/kbuild/reproducible-builds.rst
>>
>> Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
> 
> 
> 
> 
> Does not make sense.
> 
> 
> 
> KBUILD_BUILD_TIMESTAMP is not a switch for
> "please enable the reproducible build".
> 
> 
> KBUILD_BUILD_TIMESTAMP requires the build code
> to use the given time in the output where timestamps are used.
> 
> Your patch does not use the timestamp at all.
>

No, and that's not the intention. It is used as a signal to pahole to
enable reproducibility in parallel build. There is a cost to this so
it's not advisable in all scenarios [1]. Is there a kbuild-approved way
to determine if reproducible builds are in operation?

Alan

[1]
https://lore.kernel.org/dwarves/20240412211604.789632-12-acme@kernel.org/
> 
> If --btf_features=reproducible_build has no downside,
> please add it whenever supported.
> 
> 
> 
> 
> 
> 
> 
>> ---
>>  scripts/Makefile.btf | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
>> index b75f09f3f424..40bb72662967 100644
>> --- a/scripts/Makefile.btf
>> +++ b/scripts/Makefile.btf
>> @@ -21,6 +21,10 @@ else
>>  # Switch to using --btf_features for v1.26 and later.
>>  pahole-flags-$(call test-ge, $(pahole-ver), 126)  = -j --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func,decl_tag_kfuncs
>>
>> +ifneq ($(KBUILD_BUILD_TIMESTAMP),)
>> +pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=reproducible_build
>> +endif
>> +
>>  ifneq ($(KBUILD_EXTMOD),)
>>  module-pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=distilled_base
>>  endif
>> --
>> 2.31.1
>>
> 
>
Masahiro Yamada July 15, 2024, 11:19 a.m. UTC | #5 
On Tue, Jul 2, 2024 at 6:49 PM Alan Maguire <alan.maguire@oracle.com> wrote:
>
> On 02/07/2024 08:58, Masahiro Yamada wrote:
> > On Tue, Jul 2, 2024 at 2:32 AM Alan Maguire <alan.maguire@oracle.com> wrote:
> >>
> >> Reproducible builds [1] require that the same source code with
> >> the same set of tools can build identical objects each time,
> >> but pahole in parallel mode was non-deterministic in
> >> BTF generation prior to
> >>
> >> dba7b5e ("pahole: Encode BTF serially in a reproducible build")
> >>
> >> This was a problem since said BTF is baked into kernels and modules in
> >> .BTF sections, so parallel pahole was causing non-reproducible binary
> >> generation.  Now with the above commit we have support for parallel
> >> reproducible BTF generation in pahole.
> >>
> >> KBUILD_BUILD_TIMESTAMP is set for reproducible builds, so if it
> >> is set, add reproducible_build to --btf_features.
> >>
> >> [1] Documentation/kbuild/reproducible-builds.rst
> >>
> >> Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
> >
> >
> >
> >
> > Does not make sense.
> >
> >
> >
> > KBUILD_BUILD_TIMESTAMP is not a switch for
> > "please enable the reproducible build".
> >
> >
> > KBUILD_BUILD_TIMESTAMP requires the build code
> > to use the given time in the output where timestamps are used.
> >
> > Your patch does not use the timestamp at all.
> >
>
> No, and that's not the intention. It is used as a signal to pahole to
> enable reproducibility in parallel build. There is a cost to this so
> it's not advisable in all scenarios [1]. Is there a kbuild-approved way
> to determine if reproducible builds are in operation?
>
> Alan
>
> [1]
> https://lore.kernel.org/dwarves/20240412211604.789632-12-acme@kernel.org/




Kbuild already provides a standard mechanism.





config DEBUG_INFO_BTF_REPRODUCIBLE
        bool "Generate reproducible BTF"
        depends on DEBUG_INFO_BTF
        depends on PAHOLE_VERSION >= 126



pahole-flags-$(CONFIG_DEBUG_INFO_BTF_REPRODUCIBLE) =
--btf_features=reproducible_build






Presumably, it is better to add a new section
in Documentation/kbuild/reproducible-builds.rst







--
Best Regards
Masahiro Yamada
Dominique Martinet July 20, 2024, 12:12 p.m. UTC | #6 
Masahiro Yamada wrote on Mon, Jul 15, 2024 at 08:19:53PM +0900:
> Kbuild already provides a standard mechanism.
> 
> 
> 
> 
> 
> config DEBUG_INFO_BTF_REPRODUCIBLE

Ah, I thought this was already an existing option but it's a suggestion
for a new one.

With my distro hat I have to say I have no interest in chasing more
reproducible knobs for the kernel -- the current trend in 99% of the
projects is that just setting SOURCE_DATE_EPOCH "just works" and the
every non-default option that is required is work for people to track,
enable in various packaging frameworks, backport to old kernels, update
if it ever changes...

I could understand a new option "toggle everything reproducible"
that would select this, even if it doesn't do anything else right now
(perhaps also complain if KBUILD_BUILD_TIMESTAMP isn't set?), but I
can't say I'm thrilled about a new option pahole-specific that would
have to be individually enabled.

(I guess that means I've just volunteered to add both... perhaps next
year when I find time, for now the distro pahole patch toggling
reproducible if SOURCE_DATE_EPOCH is set will do)
diff mbox series

Patch

diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
index b75f09f3f424..40bb72662967 100644
--- a/scripts/Makefile.btf
+++ b/scripts/Makefile.btf
@@ -21,6 +21,10 @@  else
 # Switch to using --btf_features for v1.26 and later.
 pahole-flags-$(call test-ge, $(pahole-ver), 126)  = -j --btf_features=encode_force,var,float,enum64,decl_tag,type_tag,optimized_func,consistent_func,decl_tag_kfuncs
 
+ifneq ($(KBUILD_BUILD_TIMESTAMP),)
+pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=reproducible_build
+endif
+
 ifneq ($(KBUILD_EXTMOD),)
 module-pahole-flags-$(call test-ge, $(pahole-ver), 126) += --btf_features=distilled_base
 endif