[WIP] Linux 4.19-rc3+ compat: Remove refcount compat changes #7932

timschumi · 2018-09-20T03:48:30Z

Motivation and Context

This resolved building ZFS for Linux 4.19-rc3 and above. The reason behind this is that some header file is using refcount_t now (introduced by torvalds/linux@59b5771), which is aliased to zfs_refcount_t due to the compatibility code.
This would fix Issue #7885

Description

This patch removes the compatibility changes for refcount_t and refcount_add and replaces all occurrences of them with their counterpart (i.e. zfs_refcount_t and zfs_refcount_add).

How Has This Been Tested?

I compiled and tested the modules with Linux 4.18.8 and Linux 4.19-rc4.
I haven't run the test suite yet (I'll do that when I have the time), but for now this patch is mainly there to fix building on newer kernel versions.

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)
Documentation (a change to man pages or other documentation)

Checklist:

My code follows the ZFS on Linux code style requirements.
I have updated the documentation accordingly.
I have read the contributing document.
I have added tests to cover my changes.
All new and existing tests passed.
All commit messages are properly formatted and contain Signed-off-by.
Change has been approved by a ZFS on Linux member.

timschumi · 2018-09-20T03:51:45Z

@philmmanjaro
Would you mind testing this to see if it resolves your issues?

torvalds/linux@59b57717f ("blkcg: delay blkg destruction until after writeback has finished") added a refcount_t to the blkcg structure. Due to the refcount_t compatibility code, zfs_refcount_t was used by mistake. Resolve this by removing the compatibility code and replacing the occurrences of refcount_t with zfs_refcount_t. Signed-off-by: Tim Schumacher <timschumi@gmx.de>

ahrens · 2018-09-21T19:32:25Z

Assuming this is merged to ZoL, let's get it in illumos as well, otherwise this will cause lots of merge conflicts.

philmmanjaro · 2018-09-21T21:06:08Z

I've created a similar patch I currently use for v0.7.10 release. It compiles, however I didn't had time to test it yet, as I don't use zfs at all on my system.

behlendorf

I had hoped to avoid this, as I sure you can tell by the preprocessor slight of hand, but it doesn't seem like that's going to be possible any longer. We should consider prefixing all of the refcount functions with zfs_ to prevent any future collisions and pushing that to OpenZFS.

Additionally, updating these zfs_refcount_* functions so they're layered on their optimized kernel counterparts wouldn't be a bad idea. I'm OK with doing this in multiple parts to first resolve the immediate build issue.

fpletz

Working fine on top of 0.8.0-rc1 with Linux 3.19-rc4.

timschumi · 2018-09-25T13:01:30Z

@behlendorf
Thanks for looking at this. Should we prefix all the refcount functions and submit that to OpenZFS instead of this patch or should that be done at a later time (as a followup to this patch)? I don't feel comfortable submitting changes to OpenZFS directly, because I'm not able to test those changes (mainly due to lack of a test machine).

If we indeed go with this patch, should I fix the styling issue in the commit message or is that not worth pushing a new revision?

behlendorf · 2018-09-25T17:46:27Z

@timschumi let's go with this minimal patch as is to solve the immediate problem. If you can follow up with a PR to add the zfs_ prefix that would be appreciated. Then I'm sure we can get some help to push both of these to OpenZFS in a form they're happy with.

satmandu · 2018-10-08T16:10:47Z

Any chance of the 4.19 patch being ported back to the 0.7.x series for 0.7.12?

tonyhutter · 2018-10-08T16:28:45Z

@satmandu I added it to the 0.7.12 patchlist (https://github.com/zfsonlinux/zfs/projects/20)

torvalds/linux@59b57717f ("blkcg: delay blkg destruction until after writeback has finished") added a refcount_t to the blkcg structure. Due to the refcount_t compatibility code, zfs_refcount_t was used by mistake. Resolve this by removing the compatibility code and replacing the occurrences of refcount_t with zfs_refcount_t. Reviewed-by: Franz Pletz <fpletz@fnordicwalking.de> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Tim Schumacher <timschumi@gmx.de> Closes openzfs#7885 Closes openzfs#7932

refcount_add was removed from ZFS master in: Linux 4.19-rc3+ compat: Remove refcount_t compat openzfs/zfs#7932 It is expected to be removed in zfs-0.7.12 as well. Update Lustre to use zfs_refcount_add if zfs supports it, and fall back to refcount_add if not. Signed-off-by: Tony Hutter <hutter2@llnl.gov> Change-Id: Ib1b2ff13eb4ff8c56dd49a427b9827c6649ecd31 Reviewed-on: https://review.whamcloud.com/33359 Reviewed-by: Andreas Dilger <adilger@whamcloud.com> Reviewed-by: Nathaniel Clark <nclark@whamcloud.com> Tested-by: Jenkins Tested-by: Maloo <hpdd-maloo@intel.com> Reviewed-by: Oleg Drokin <green@whamcloud.com>

torvalds/linux@59b57717f ("blkcg: delay blkg destruction until after writeback has finished") added a refcount_t to the blkcg structure. Due to the refcount_t compatibility code, zfs_refcount_t was used by mistake. Resolve this by removing the compatibility code and replacing the occurrences of refcount_t with zfs_refcount_t. Reviewed-by: Franz Pletz <fpletz@fnordicwalking.de> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Tim Schumacher <timschumi@gmx.de> Closes #7885 Closes #7932

torvalds/linux@59b57717f ("blkcg: delay blkg destruction until after writeback has finished") added a refcount_t to the blkcg structure. Due to the refcount_t compatibility code, zfs_refcount_t was used by mistake. Resolve this by removing the compatibility code and replacing the occurrences of refcount_t with zfs_refcount_t. Reviewed-by: Franz Pletz <fpletz@fnordicwalking.de> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Tim Schumacher <timschumi@gmx.de> Closes openzfs#7885 Closes openzfs#7932

refcount_add was removed from ZFS master in: Linux 4.19-rc3+ compat: Remove refcount_t compat openzfs/zfs#7932 It is expected to be removed in zfs-0.7.12 as well. Update Lustre to use zfs_refcount_add if zfs supports it, and fall back to refcount_add if not. Signed-off-by: Tony Hutter <hutter2@llnl.gov> Change-Id: Ib1b2ff13eb4ff8c56dd49a427b9827c6649ecd31 Reviewed-on: https://review.whamcloud.com/33359 Reviewed-by: Andreas Dilger <adilger@whamcloud.com> Reviewed-by: Nathaniel Clark <nclark@whamcloud.com> Tested-by: Jenkins Tested-by: Maloo <hpdd-maloo@intel.com> Reviewed-by: Oleg Drokin <green@whamcloud.com> Conflicts: config/lustre-build-zfs.m4 lustre/osd-zfs/osd_internal.h lustre/osd-zfs/osd_object.c

refcount_add was removed from ZFS master in: Linux 4.19-rc3+ compat: Remove refcount_t compat openzfs/zfs#7932 It is expected to be removed in zfs-0.7.12 as well. Update Lustre to use zfs_refcount_add if zfs supports it, and fall back to refcount_add if not. Signed-off-by: Tony Hutter <hutter2@llnl.gov> Change-Id: Ib1b2ff13eb4ff8c56dd49a427b9827c6649ecd31 Reviewed-on: https://review.whamcloud.com/33359 Reviewed-by: Andreas Dilger <adilger@whamcloud.com> Reviewed-by: Nathaniel Clark <nclark@whamcloud.com> Tested-by: Jenkins Tested-by: Maloo <hpdd-maloo@intel.com> Reviewed-by: Oleg Drokin <green@whamcloud.com> Cherry-picked from 2.12.2-llnl 89f8ee7 LU-11507 osd-zfs: Use zfs_refcount_add if available

refcount_add was removed from ZFS master in: Linux 4.19-rc3+ compat: Remove refcount_t compat openzfs/zfs#7932 It is expected to be removed in zfs-0.7.12 as well. Update Lustre to use zfs_refcount_add if zfs supports it, and fall back to refcount_add if not. Signed-off-by: Tony Hutter <hutter2@llnl.gov> Change-Id: Ib1b2ff13eb4ff8c56dd49a427b9827c6649ecd31 Reviewed-on: https://review.whamcloud.com/33359 Reviewed-by: Andreas Dilger <adilger@whamcloud.com> Reviewed-by: Nathaniel Clark <nclark@whamcloud.com> Tested-by: Jenkins Tested-by: Maloo <hpdd-maloo@intel.com> Reviewed-by: Oleg Drokin <green@whamcloud.com> Cherry-picked from 2.12.2-llnl 89f8ee7 LU-11507 osd-zfs: Use zfs_refcount_add if available Test-Parameters: forbuildonly

refcount_add was removed from ZFS master in: Linux 4.19-rc3+ compat: Remove refcount_t compat openzfs/zfs#7932 It is expected to be removed in zfs-0.7.12 as well. Update Lustre to use zfs_refcount_add if zfs supports it, and fall back to refcount_add if not. Signed-off-by: Tony Hutter <hutter2@llnl.gov> Change-Id: Ib1b2ff13eb4ff8c56dd49a427b9827c6649ecd31 Reviewed-on: https://review.whamcloud.com/33359 Reviewed-by: Andreas Dilger <adilger@whamcloud.com> Reviewed-by: Nathaniel Clark <nclark@whamcloud.com> Tested-by: Jenkins Tested-by: Maloo <hpdd-maloo@intel.com> Reviewed-by: Oleg Drokin <green@whamcloud.com> Cherry-pick-branch: 2.12.2-llnl Cherry-pick-hash:89f8ee7 Test-Parameters: forbuildonly

refcount_add was removed from ZFS master in: Linux 4.19-rc3+ compat: Remove refcount_t compat openzfs/zfs#7932 It is expected to be removed in zfs-0.7.12 as well. Update Lustre to use zfs_refcount_add if zfs supports it, and fall back to refcount_add if not. Cherry-pick-branch: 2.12.2-llnl Cherry-pick-hash:89f8ee7 Test-Parameters: forbuildonly Signed-off-by: Tony Hutter <hutter2@llnl.gov> Change-Id: Ib1b2ff13eb4ff8c56dd49a427b9827c6649ecd31

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

behlendorf approved these changes Sep 21, 2018

View reviewed changes

fpletz approved these changes Sep 24, 2018

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 25, 2018

behlendorf merged commit c13060e into openzfs:master Sep 26, 2018

timschumi deleted the patch/linux-4.19-compat branch September 27, 2018 01:47

tonyhutter added this to To do in 0.7.12 Oct 8, 2018

tonyhutter moved this from To do to In progress in 0.7.12 Oct 26, 2018

rincebrain mentioned this pull request Oct 28, 2018

zfs building issues #8068

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Linux 4.19-rc3+ compat: Remove refcount compat changes #7932

[WIP] Linux 4.19-rc3+ compat: Remove refcount compat changes #7932

timschumi commented Sep 20, 2018 •

edited

timschumi commented Sep 20, 2018

ahrens commented Sep 21, 2018

philmmanjaro commented Sep 21, 2018

behlendorf left a comment

fpletz left a comment

timschumi commented Sep 25, 2018

behlendorf commented Sep 25, 2018

satmandu commented Oct 8, 2018

tonyhutter commented Oct 8, 2018

[WIP] Linux 4.19-rc3+ compat: Remove refcount compat changes #7932

[WIP] Linux 4.19-rc3+ compat: Remove refcount compat changes #7932

Conversation

timschumi commented Sep 20, 2018 • edited

Motivation and Context

Description

How Has This Been Tested?

Types of changes

Checklist:

timschumi commented Sep 20, 2018

ahrens commented Sep 21, 2018

philmmanjaro commented Sep 21, 2018

behlendorf left a comment

Choose a reason for hiding this comment

fpletz left a comment

Choose a reason for hiding this comment

timschumi commented Sep 25, 2018

behlendorf commented Sep 25, 2018

satmandu commented Oct 8, 2018

tonyhutter commented Oct 8, 2018

timschumi commented Sep 20, 2018 •

edited