Linux 5.15 compat: standalone <linux/stdarg.h> #12531

solbjorn · 2021-09-01T21:28:12Z

Motivation and Context

Commits

39f75da7bcc8 ("isystem: trim/fixup stdarg.h and other headers")
c0891ac15f04 ("isystem: ship and use stdarg.h")
564f963eabd1 ("isystem: delete global -isystem compile option")

(for now can be found in linux-next.git tree, will land into the Linus' tree during the ongoing 5.15 cycle with one of akpm merges)

removed the -isystem flag and disallowed the inclusion of any compiler header files. They also introduced a minimal <linux/stdarg.h> as a replacement for <stdarg.h>.
include/os/linux/spl/sys/cmn_err.h in the ZFS source tree includes <stdarg.h> unconditionally. Introduce a test for <linux/stdarg.h> and include it instead of the compiler's one to prevent module build breakage.

How Has This Been Tested?

A configuration and then build of ZFS module were run, for a kernel tree containing changes from the mentioned commits.

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Performance enhancement (non-breaking change which improves efficiency)
Code cleanup (non-breaking change which makes code smaller or more readable)
Breaking change (fix or feature that would cause existing functionality to change)
Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
Documentation (a change to man pages or other documentation)

Checklist:

My code follows the OpenZFS code style requirements.
I have updated the documentation accordingly.
I have read the contributing document.
I have added tests to cover my changes.
I have run the ZFS Test Suite with this change applied.
All commit messages are properly formatted and contain Signed-off-by.

behlendorf

Thanks for the heads up. This looks reasonable to me.

behlendorf · 2021-09-02T17:25:26Z

@ckane would you mind taking a look at this too.

tonynguien

Looks good to me.

solbjorn · 2021-09-03T21:05:14Z

Could someone please explain what "indirect sub-type changes" is (in CheckABI)?

behlendorf · 2021-09-04T00:32:48Z

That's an unrelated infrastructure change on our part. You should be able to resolve it be rebasing on the latest master source and then force updating the PR.

solbjorn · 2021-09-04T12:15:04Z

It's up to date with the master currently. I took a look on the functions and seems CheckABI doesn't like that va_list may be altered depending on which stdarg.h (compiler's one or shipped with the kernel) is used. Still unclear for me as CheckABI tests only userspace part while this PR's code is guarded with _KERNEL.

behlendorf · 2021-09-07T19:23:49Z

@solbjorn it looks like this PR is just a few commits behind the master branch. The critical commits missing were from the #12529 PR which effectively bumped the minimum version of libabigail required and generated new ABI reference file for that version. After I rebased this PR locally on to those changes it resolved the CheckABI failure as expected. If you can rebase this PR on to at least 3eb3e4d from the master branch that should sort it out.

solbjorn · 2021-09-07T21:51:09Z

Ah, forgot to fetch master to my fork, sorry. All is fine now, thanks!

Commits 39f75da7bcc8 ("isystem: trim/fixup stdarg.h and other headers") c0891ac15f04 ("isystem: ship and use stdarg.h") 564f963eabd1 ("isystem: delete global -isystem compile option") (for now can be found in linux-next.git tree, will land into the Linus' tree during the ongoing 5.15 cycle with one of akpm merges) removed the -isystem flag and disallowed the inclusion of any compiler header files. They also introduced a minimal <linux/stdarg.h> as a replacement for <stdarg.h>. include/os/linux/spl/sys/cmn_err.h in the ZFS source tree includes <stdarg.h> unconditionally. Introduce a test for <linux/stdarg.h> and include it instead of the compiler's one to prevent module build breakage. Signed-off-by: Alexander Lobakin <[email protected]>

Kernel commits 39f75da7bcc8 ("isystem: trim/fixup stdarg.h and other headers") c0891ac15f04 ("isystem: ship and use stdarg.h") 564f963eabd1 ("isystem: delete global -isystem compile option") (for now can be found in linux-next.git tree, will land into the Linus' tree during the ongoing 5.15 cycle with one of akpm merges) removed the -isystem flag and disallowed the inclusion of any compiler header files. They also introduced a minimal <linux/stdarg.h> as a replacement for <stdarg.h>. include/os/linux/spl/sys/cmn_err.h in the ZFS source tree includes <stdarg.h> unconditionally. Introduce a test for <linux/stdarg.h> and include it instead of the compiler's one to prevent module build breakage. Reviewed-by: Tony Nguyen <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Alexander Lobakin <[email protected]> Closes openzfs#12531

Kernel commits 39f75da7bcc8 ("isystem: trim/fixup stdarg.h and other headers") c0891ac15f04 ("isystem: ship and use stdarg.h") 564f963eabd1 ("isystem: delete global -isystem compile option") (for now can be found in linux-next.git tree, will land into the Linus' tree during the ongoing 5.15 cycle with one of akpm merges) removed the -isystem flag and disallowed the inclusion of any compiler header files. They also introduced a minimal <linux/stdarg.h> as a replacement for <stdarg.h>. include/os/linux/spl/sys/cmn_err.h in the ZFS source tree includes <stdarg.h> unconditionally. Introduce a test for <linux/stdarg.h> and include it instead of the compiler's one to prevent module build breakage. Reviewed-by: Tony Nguyen <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Alexander Lobakin <[email protected]> Closes #12531

Kernel commits 39f75da7bcc8 ("isystem: trim/fixup stdarg.h and other headers") c0891ac15f04 ("isystem: ship and use stdarg.h") 564f963eabd1 ("isystem: delete global -isystem compile option") (for now can be found in linux-next.git tree, will land into the Linus' tree during the ongoing 5.15 cycle with one of akpm merges) removed the -isystem flag and disallowed the inclusion of any compiler header files. They also introduced a minimal <linux/stdarg.h> as a replacement for <stdarg.h>. include/os/linux/spl/sys/cmn_err.h in the ZFS source tree includes <stdarg.h> unconditionally. Introduce a test for <linux/stdarg.h> and include it instead of the compiler's one to prevent module build breakage. Reviewed-by: Tony Nguyen <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Alexander Lobakin <[email protected]> Closes openzfs#12531

Kernel commits 39f75da7bcc8 ("isystem: trim/fixup stdarg.h and other headers") c0891ac15f04 ("isystem: ship and use stdarg.h") 564f963eabd1 ("isystem: delete global -isystem compile option") (for now can be found in linux-next.git tree, will land into the Linus' tree during the ongoing 5.15 cycle with one of akpm merges) removed the -isystem flag and disallowed the inclusion of any compiler header files. They also introduced a minimal <linux/stdarg.h> as a replacement for <stdarg.h>. include/os/linux/spl/sys/cmn_err.h in the ZFS source tree includes <stdarg.h> unconditionally. Introduce a test for <linux/stdarg.h> and include it instead of the compiler's one to prevent module build breakage. Reviewed-by: Tony Nguyen <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Alexander Lobakin <[email protected]> Closes #12531

Kernel commits 39f75da7bcc8 ("isystem: trim/fixup stdarg.h and other headers") c0891ac15f04 ("isystem: ship and use stdarg.h") 564f963eabd1 ("isystem: delete global -isystem compile option") (for now can be found in linux-next.git tree, will land into the Linus' tree during the ongoing 5.15 cycle with one of akpm merges) removed the -isystem flag and disallowed the inclusion of any compiler header files. They also introduced a minimal <linux/stdarg.h> as a replacement for <stdarg.h>. include/os/linux/spl/sys/cmn_err.h in the ZFS source tree includes <stdarg.h> unconditionally. Introduce a test for <linux/stdarg.h> and include it instead of the compiler's one to prevent module build breakage. Reviewed-by: Tony Nguyen <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Alexander Lobakin <[email protected]> Closes openzfs#12531

behlendorf added the Status: Code Review Needed Ready for review and testing label Sep 1, 2021

behlendorf approved these changes Sep 1, 2021

View reviewed changes

behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Sep 2, 2021

behlendorf added the Type: Building Indicates an issue related to building binaries label Sep 2, 2021

tonynguien approved these changes Sep 2, 2021

View reviewed changes

tonynguien self-assigned this Sep 2, 2021

behlendorf merged commit a3588c6 into openzfs:master Sep 8, 2021

satmandu mentioned this pull request Sep 13, 2021

zfs-2.1.1 patchset #12547

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Linux 5.15 compat: standalone <linux/stdarg.h> #12531

Linux 5.15 compat: standalone <linux/stdarg.h> #12531

Uh oh!

solbjorn commented Sep 1, 2021

Uh oh!

behlendorf left a comment

Uh oh!

behlendorf commented Sep 2, 2021

Uh oh!

tonynguien left a comment

Uh oh!

solbjorn commented Sep 3, 2021 •

edited

Loading

Uh oh!

behlendorf commented Sep 4, 2021

Uh oh!

solbjorn commented Sep 4, 2021

Uh oh!

behlendorf commented Sep 7, 2021

Uh oh!

solbjorn commented Sep 7, 2021

Uh oh!

Uh oh!

Linux 5.15 compat: standalone <linux/stdarg.h> #12531

Linux 5.15 compat: standalone <linux/stdarg.h> #12531

Uh oh!

Conversation

solbjorn commented Sep 1, 2021

Motivation and Context

How Has This Been Tested?

Types of changes

Checklist:

Uh oh!

behlendorf left a comment

Choose a reason for hiding this comment

Uh oh!

behlendorf commented Sep 2, 2021

Uh oh!

tonynguien left a comment

Choose a reason for hiding this comment

Uh oh!

solbjorn commented Sep 3, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

behlendorf commented Sep 4, 2021

Uh oh!

solbjorn commented Sep 4, 2021

Uh oh!

behlendorf commented Sep 7, 2021

Uh oh!

solbjorn commented Sep 7, 2021

Uh oh!

Uh oh!

solbjorn commented Sep 3, 2021 •

edited

Loading