Linux 5.14 compat: blk_alloc_disk() #12409

behlendorf · 2021-07-21T17:12:41Z

Motivation and Context

Support for 5.14-rc1 and newer kernels.

Description

In Linux 5.14, blk_alloc_queue is no longer exported, and its usage
has been superseded by blk_alloc_disk, which returns a gendisk struct
from which we can still retrieve the struct request_queue* that is
needed in the one place where it is used. This also replaces the call
to alloc_disk(minors), and minors is now set via struct member
assignment.

Description shamelessly stolen from @ckane's PR #12362 which
effectively makes this same change without some of the additional
minor refactoring.

How Has This Been Tested?

Locally compiled, and @ckane manually did some testing of this
fix on the 5.14-rc1 kernel. Pending full CI run.

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.

In Linux 5.14, blk_alloc_queue is no longer exported, and its usage has been superseded by blk_alloc_disk, which returns a gendisk struct from which we can still retrieve the struct request_queue* that is needed in the one place where it is used. This also replaces the call to alloc_disk(minors), and minors is now set via struct member assignment. Reviewed-by: Coleman Kane <ckane@colemankane.org> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

ckane

Reviewed code & tested (as much as I can on 5.14rc2) and this change builds fine and seems to work without problems.

ckane · 2021-07-21T19:45:40Z

Also this will close #12362

ofaaland

LGTM

ckane · 2021-07-23T03:27:52Z

Ok heads-up on this one @behlendorf, I might have run into a regression with this on kernel 5.14rc2.... I am not certain if this is a bug related to the change, or if there is some other breakage introduced with 5.14 that just happens to be apparent now that the modules are compiling and are bootable.

The behavior I am seeing is that when ZFS is loaded and mounted as root, for some reason systemd-journald is having trouble writing to the systemd journal files in /var/log/journal. This results in all systemd logging to go to console, and seems to result in halting when running journalctl -x or when shutting down/rebooting using reboot or poweroff.

I think I have a VirtualBox VM that I am producing an OVA for that manages to exhibit the problem, so I am happy to share that with you.

behlendorf · 2021-07-23T22:01:07Z

@ckane thanks for the heads up. It definitely sounds like a different issue with the 5.14 kernel, this specific fix should be good to merge.

In Linux 5.14, blk_alloc_queue is no longer exported, and its usage has been superseded by blk_alloc_disk, which returns a gendisk struct from which we can still retrieve the struct request_queue* that is needed in the one place where it is used. This also replaces the call to alloc_disk(minors), and minors is now set via struct member assignment. Reviewed-by: Tony Nguyen <tony.nguyen@delphix.com> Reviewed-by: Olaf Faaland <faaland1@llnl.gov> Reviewed-by: Coleman Kane <ckane@colemankane.org> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes openzfs#12362 Closes openzfs#12409

In Linux 5.14, blk_alloc_queue is no longer exported, and its usage has been superseded by blk_alloc_disk, which returns a gendisk struct from which we can still retrieve the struct request_queue* that is needed in the one place where it is used. This also replaces the call to alloc_disk(minors), and minors is now set via struct member assignment. Reviewed-by: Tony Nguyen <tony.nguyen@delphix.com> Reviewed-by: Olaf Faaland <faaland1@llnl.gov> Reviewed-by: Coleman Kane <ckane@colemankane.org> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #12362 Closes #12409

In Linux 5.14, blk_alloc_queue is no longer exported, and its usage has been superseded by blk_alloc_disk, which returns a gendisk struct from which we can still retrieve the struct request_queue* that is needed in the one place where it is used. This also replaces the call to alloc_disk(minors), and minors is now set via struct member assignment. Reviewed-by: Tony Nguyen <tony.nguyen@delphix.com> Reviewed-by: Olaf Faaland <faaland1@llnl.gov> Reviewed-by: Coleman Kane <ckane@colemankane.org> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes openzfs#12362 Closes openzfs#12409

In Linux 5.14, blk_alloc_queue is no longer exported, and its usage has been superseded by blk_alloc_disk, which returns a gendisk struct from which we can still retrieve the struct request_queue* that is needed in the one place where it is used. This also replaces the call to alloc_disk(minors), and minors is now set via struct member assignment. Reviewed-by: Tony Nguyen <tony.nguyen@delphix.com> Reviewed-by: Olaf Faaland <faaland1@llnl.gov> Reviewed-by: Coleman Kane <ckane@colemankane.org> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #12362 Closes #12409

In Linux 5.14, blk_alloc_queue is no longer exported, and its usage has been superseded by blk_alloc_disk, which returns a gendisk struct from which we can still retrieve the struct request_queue* that is needed in the one place where it is used. This also replaces the call to alloc_disk(minors), and minors is now set via struct member assignment. Reviewed-by: Tony Nguyen <tony.nguyen@delphix.com> Reviewed-by: Olaf Faaland <faaland1@llnl.gov> Reviewed-by: Coleman Kane <ckane@colemankane.org> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes openzfs#12362 Closes openzfs#12409

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

behlendorf mentioned this pull request Jul 21, 2021

Compatibility update for 5.14 for blk_alloc_disk() #12362

Closed

13 tasks

ckane approved these changes Jul 21, 2021

View reviewed changes

ofaaland approved these changes Jul 22, 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 Jul 22, 2021

tonynguien approved these changes Jul 23, 2021

View reviewed changes

tonynguien self-assigned this Jul 23, 2021

behlendorf merged commit 1b06b03 into openzfs:master Jul 23, 2021

ckane mentioned this pull request Jul 24, 2021

5.14 compat: explicity assign set_page_dirty #12427

Merged

13 tasks

SilverBut mentioned this pull request Sep 21, 2021

OpenZFS 2.1.1 upstream release eli-schwartz/pkgbuilds#32

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Linux 5.14 compat: blk_alloc_disk() #12409

Linux 5.14 compat: blk_alloc_disk() #12409

behlendorf commented Jul 21, 2021

ckane left a comment

ckane commented Jul 21, 2021

ofaaland left a comment

ckane commented Jul 23, 2021

behlendorf commented Jul 23, 2021

Linux 5.14 compat: blk_alloc_disk() #12409

Linux 5.14 compat: blk_alloc_disk() #12409

Conversation

behlendorf commented Jul 21, 2021

Motivation and Context

Description

How Has This Been Tested?

Types of changes

Checklist:

ckane left a comment

Choose a reason for hiding this comment

ckane commented Jul 21, 2021

ofaaland left a comment

Choose a reason for hiding this comment

ckane commented Jul 23, 2021

behlendorf commented Jul 23, 2021