Fixes 5.12 bio bi_bdev additions and GPL issues with bio_*_io_acct functions #11639
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The struct bio member bi_disk was moved underneat a new member named bi_bdev. So all attempts to reference bio->bi_disk need to now become bio->bi_bdev->bd_disk. Signed-off-by: Coleman Kane <[email protected]>
The bio_*_acct functions became GPL exports, which is causing the kernel modules to refuse to compile. This replaces code with alternate function calls to the disk_*_io_acct interfaces, which are not GPL exports. This change was added in kernel commit 99dfc43ecbf67f12a06512918aaba61d55863efc. Signed-off-by: Coleman Kane <[email protected]>
behlendorf
approved these changes
Feb 23, 2021
behlendorf
added
Status: Accepted
behlendorf
pushed a commit
that referenced
this pull request
Feb 24, 2021
The bio_*_acct functions became GPL exports, which causes the kernel modules to refuse to compile. This replaces code with alternate function calls to the disk_*_io_acct interfaces, which are not GPL exports. This change was added in kernel commit 99dfc43ecbf67f12a06512918aaba61d55863efc. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Coleman Kane <[email protected]> Closes #11639
behlendorf
pushed a commit
that referenced
this pull request
Mar 5, 2021
The struct bio member bi_disk was moved underneath a new member named bi_bdev. So all attempts to reference bio->bi_disk need to now become bio->bi_bdev->bd_disk. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Coleman Kane <[email protected]> Closes #11639
behlendorf
pushed a commit
that referenced
this pull request
Mar 5, 2021
The bio_*_acct functions became GPL exports, which causes the kernel modules to refuse to compile. This replaces code with alternate function calls to the disk_*_io_acct interfaces, which are not GPL exports. This change was added in kernel commit 99dfc43ecbf67f12a06512918aaba61d55863efc. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Coleman Kane <[email protected]> Closes #11639
jsai20
pushed a commit
to jsai20/zfs
that referenced
this pull request
Mar 30, 2021
The struct bio member bi_disk was moved underneath a new member named bi_bdev. So all attempts to reference bio->bi_disk need to now become bio->bi_bdev->bd_disk. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Coleman Kane <[email protected]> Closes openzfs#11639
jsai20
pushed a commit
to jsai20/zfs
that referenced
this pull request
Mar 30, 2021
The bio_*_acct functions became GPL exports, which causes the kernel modules to refuse to compile. This replaces code with alternate function calls to the disk_*_io_acct interfaces, which are not GPL exports. This change was added in kernel commit 99dfc43ecbf67f12a06512918aaba61d55863efc. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Coleman Kane <[email protected]> Closes openzfs#11639
10 tasks
sempervictus
pushed a commit
to sempervictus/zfs
that referenced
this pull request
May 31, 2021
The struct bio member bi_disk was moved underneath a new member named bi_bdev. So all attempts to reference bio->bi_disk need to now become bio->bi_bdev->bd_disk. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Coleman Kane <[email protected]> Closes openzfs#11639
sempervictus
pushed a commit
to sempervictus/zfs
that referenced
this pull request
May 31, 2021
The bio_*_acct functions became GPL exports, which causes the kernel modules to refuse to compile. This replaces code with alternate function calls to the disk_*_io_acct interfaces, which are not GPL exports. This change was added in kernel commit 99dfc43ecbf67f12a06512918aaba61d55863efc. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Coleman Kane <[email protected]> Closes openzfs#11639
|
I am seeing this problem with Linux 6.2.8 and zfs-staging a5c469c again. |
|
Specifically: |
Can you open up a new issue to track the regression from the newer kernel? GitHub is going to keep this issue buried from view since it is already closed. |
|
It's already open: #14658 — it was just easier to find this one, I apologize for the noise. |
|
No worries, after I responded I went back and looked around a bit and found that one too - noise is no problem, just wanted to make sure it didn't get lost. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
Recent changes in the Linux kernel 5.12 merges modified the interfaces in the following breaking manners:
bio_start_io_acctandbio_end_io_acctbecame GPL'd exportsbio->bi_diskmember was moved into a newstruct block_device*member ofstruct biosuch that accessing it now must be done asbio->bi_bdev->bd_diskDescription
Replaced calls to
bio_*_io_acctwith corresponding calls todisk_*_io_acct, the latter are not GPL-encumberedHow Has This Been Tested?
I have been using this in production on my personal system with ZFS root and so far it has been working fine
Types of changes
Checklist:
Signed-off-by.