Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Linux 5.16 compat - fpu/xcr.h header and folio_wait_bit() changes #12800

Closed
wants to merge 2 commits into from
Closed

Linux 5.16 compat - fpu/xcr.h header and folio_wait_bit() changes #12800

wants to merge 2 commits into from

Conversation

ckane
Copy link
Contributor

@ckane ckane commented Nov 26, 2021 •
edited
Loading

Motivation and Context

Commit 1b4fb8545f2b00f2844c4b7619d64d98440a477c moved the xgetbv & xsetbv into asm/fpu/xcr.h. This breaks compilation when include/os/linux/kernel/linux/simd_x86.h is included.

This PR also includes a fix for the replacement of wait_on_page_bit() -> folio_wait_bit(), as the former is no longer available to modules.

Description

This change tests for the presence of the aforementioned header in configure, and if present, will include it in simd_x86.h.
This change also tests for the presence of folio_wait_bit() and conditionally compiles code using that API, if present.

How Has This Been Tested?

So far I have only compile-tested this, as there are other regressions due to 5.16 that prevent the build from completing successfully.

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:

@ckane ckane changed the title Linux 5.16 compat ckane Linux 5.16 compat - fpu/xcr.h header and wait_on_page_writeback() changes Nov 26, 2021
@ckane ckane changed the title Linux 5.16 compat - fpu/xcr.h header and wait_on_page_writeback() changes Linux 5.16 compat - fpu/xcr.h header and folio_wait_bit() changes Nov 26, 2021
@ckane
Linux 5.16: wait_on_page_bit() no longer available to modules
660ccd7 
Instead, linux/pagemap.h offers a number of folio-specific functions to
be called instead. In this case, module/os/linux/zfs/zfs_vnops_os.c
wants to call wait_on_page_bit(pp, PG_writeback). This gets replaced
with folio_wait_bit(folio_page(pp), PG_writeback). This change modifies
the code to conditionally compile that if configure identifies th
presence of the folio_wait_bit() function.

Signed-off-by: Coleman Kane <ckane@colemankane.org>
@ckane
Linux 5.16 compat: asm/fpu/xcr.h is new location for xgetbv/xsetbv
30b6973 
Linux 5.16 moved these functions into this new header in commit
1b4fb8545f2b00f2844c4b7619d64d98440a477c. This change adds code to look
for the presence of this header, and include it so that the code using
xgetbv & xsetbv will compile again.

Signed-off-by: Coleman Kane <ckane@colemankane.org>
This was referenced Nov 29, 2021
Closed
Merged
behlendorf
behlendorf approved these changes Nov 29, 2021
View reviewed changes
Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One step closer, thanks for sorting out this API change. LGTM.

@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label Nov 29, 2021
behlendorf pushed a commit that referenced this pull request Nov 29, 2021
@ckane @behlendorf
Linux 5.16 compat: asm/fpu/xcr.h is new location for xgetbv/xsetbv
75b309a 
Linux 5.16 moved these functions into this new header in commit
1b4fb8545f2b00f2844c4b7619d64d98440a477c. This change adds code to look
for the presence of this header, and include it so that the code using
xgetbv & xsetbv will compile again.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes #12800
@satmandu satmandu mentioned this pull request Nov 30, 2021
Closed
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Dec 6, 2021
@ckane @tonyhutter
Linux 5.16: wait_on_page_bit() no longer available to modules
12d27e7 
Instead, linux/pagemap.h offers a number of folio-specific functions to
be called instead. In this case, module/os/linux/zfs/zfs_vnops_os.c
wants to call wait_on_page_bit(pp, PG_writeback). This gets replaced
with folio_wait_bit(folio_page(pp), PG_writeback). This change modifies
the code to conditionally compile that if configure identifies th
presence of the folio_wait_bit() function.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes openzfs#12800
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Dec 6, 2021
@ckane @tonyhutter
Linux 5.16: wait_on_page_bit() no longer available to modules
679be59 
Instead, linux/pagemap.h offers a number of folio-specific functions to
be called instead. In this case, module/os/linux/zfs/zfs_vnops_os.c
wants to call wait_on_page_bit(pp, PG_writeback). This gets replaced
with folio_wait_bit(folio_page(pp), PG_writeback). This change modifies
the code to conditionally compile that if configure identifies th
presence of the folio_wait_bit() function.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes openzfs#12800
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Dec 7, 2021
@ckane @tonyhutter
Linux 5.16 compat: asm/fpu/xcr.h is new location for xgetbv/xsetbv
541fe3d 
Linux 5.16 moved these functions into this new header in commit
1b4fb8545f2b00f2844c4b7619d64d98440a477c. This change adds code to look
for the presence of this header, and include it so that the code using
xgetbv & xsetbv will compile again.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes openzfs#12800
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Dec 7, 2021
@ckane @tonyhutter
Linux 5.16 compat: asm/fpu/xcr.h is new location for xgetbv/xsetbv
806c377 
Linux 5.16 moved these functions into this new header in commit
1b4fb8545f2b00f2844c4b7619d64d98440a477c. This change adds code to look
for the presence of this header, and include it so that the code using
xgetbv & xsetbv will compile again.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes openzfs#12800
@yunginnanet yunginnanet mentioned this pull request Feb 22, 2022
Closed
18 tasks
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@ckane @nicman23
Linux 5.16: wait_on_page_bit() no longer available to modules
101430d 
Instead, linux/pagemap.h offers a number of folio-specific functions to
be called instead. In this case, module/os/linux/zfs/zfs_vnops_os.c
wants to call wait_on_page_bit(pp, PG_writeback). This gets replaced
with folio_wait_bit(folio_page(pp), PG_writeback). This change modifies
the code to conditionally compile that if configure identifies th
presence of the folio_wait_bit() function.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes openzfs#12800
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@ckane @nicman23
Linux 5.16 compat: asm/fpu/xcr.h is new location for xgetbv/xsetbv
131a8d9 
Linux 5.16 moved these functions into this new header in commit
1b4fb8545f2b00f2844c4b7619d64d98440a477c. This change adds code to look
for the presence of this header, and include it so that the code using
xgetbv & xsetbv will compile again.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes openzfs#12800
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@ckane @nicman23
Linux 5.16: wait_on_page_bit() no longer available to modules
a686efa 
Instead, linux/pagemap.h offers a number of folio-specific functions to
be called instead. In this case, module/os/linux/zfs/zfs_vnops_os.c
wants to call wait_on_page_bit(pp, PG_writeback). This gets replaced
with folio_wait_bit(folio_page(pp), PG_writeback). This change modifies
the code to conditionally compile that if configure identifies th
presence of the folio_wait_bit() function.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes openzfs#12800
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@ckane @nicman23
Linux 5.16 compat: asm/fpu/xcr.h is new location for xgetbv/xsetbv
392c5bc 
Linux 5.16 moved these functions into this new header in commit
1b4fb8545f2b00f2844c4b7619d64d98440a477c. This change adds code to look
for the presence of this header, and include it so that the code using
xgetbv & xsetbv will compile again.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes openzfs#12800
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@behlendorf behlendorf behlendorf approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ckane @behlendorf