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

register_sysctl_table removed in Linux 6.5 (try to fix #2) #15138

Merged
merged 1 commit into from
Aug 2, 2023
Merged

register_sysctl_table removed in Linux 6.5 (try to fix #2) #15138

merged 1 commit into from
Aug 2, 2023

Conversation

ckane
Copy link
Contributor

@ckane ckane commented Aug 1, 2023

Motivation and Context

In Linux 6.5, register_sysctl_table has been removed.

Description

This commit fixes that by calling the appropriate register_sysctl calls instead when running on kernels lacking the register_sysctl_table call.

This is the second attempt to fix this regression, as a typo was pointed out in #15134

An additional recommendation would be to add a ZFS test to the test suite that will perform the following sequence, more or less, and throw a test case failure if any of the iterations report an error:

for i in `seq 10`; do
  zfs.sh -v && sleep 5 && zfs.sh -vu
done

How Has This Been Tested?

Reproduced the failure reported in #15134 in a CentOS 8 Stream VM. It was reproduceable with or without any ZFS pools present.

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
register_sysctl_table removed in Linux 6.5
5f56a4b 
Additionally, the .child element of ctl_table has been removed in 6.5.
This change adds a new test for the pre-6.5 register_sysctl_table()
function, and uses the old code in that case. If it isn't found, then
the parentage entries in the tables are removed, and the register_sysctl
call is provided the paths of "kernel/spl", "kernel/spl/kmem", and
"kernel/spl/kstat" directly, to populate each subdirectory over three
calls, as is the new API.

Signed-off-by: Coleman Kane <[email protected]>
@ckane ckane mentioned this pull request Aug 1, 2023
Merged
13 tasks
@behlendorf behlendorf requested a review from bwatkinson August 1, 2023 23:53
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Aug 1, 2023
@satmandu satmandu mentioned this pull request Aug 2, 2023
Closed
bwatkinson
bwatkinson approved these changes Aug 2, 2023
View reviewed changes
Copy link
Contributor

@bwatkinson bwatkinson left a comment

Choose a reason for hiding this comment

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

Just tested this out again. It works fine now. Thanks for running down this issue.

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Aug 2, 2023
@behlendorf behlendorf merged commit e47e9bb into openzfs:master Aug 2, 2023
stgraber pushed a commit to zabbly/zfs that referenced this pull request Sep 5, 2023
@ckane @stgraber
Linux 6.5 compat: register_sysctl_table removed
97fd3e9 
Additionally, the .child element of ctl_table has been removed in 6.5.
This change adds a new test for the pre-6.5 register_sysctl_table()
function, and uses the old code in that case. If it isn't found, then
the parentage entries in the tables are removed, and the register_sysctl
call is provided the paths of "kernel/spl", "kernel/spl/kmem", and
"kernel/spl/kstat" directly, to populate each subdirectory over three
calls, as is the new API.

Reviewed-by: Brian Atkinson <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#15138
stgraber pushed a commit to zabbly/zfs that referenced this pull request Sep 8, 2023
@ckane @stgraber
Linux 6.5 compat: register_sysctl_table removed
b27da92 
Additionally, the .child element of ctl_table has been removed in 6.5.
This change adds a new test for the pre-6.5 register_sysctl_table()
function, and uses the old code in that case. If it isn't found, then
the parentage entries in the tables are removed, and the register_sysctl
call is provided the paths of "kernel/spl", "kernel/spl/kmem", and
"kernel/spl/kstat" directly, to populate each subdirectory over three
calls, as is the new API.

Reviewed-by: Brian Atkinson <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#15138
behlendorf pushed a commit that referenced this pull request Sep 19, 2023
@ckane @behlendorf
Linux 6.5 compat: register_sysctl_table removed
31a4673 
Additionally, the .child element of ctl_table has been removed in 6.5.
This change adds a new test for the pre-6.5 register_sysctl_table()
function, and uses the old code in that case. If it isn't found, then
the parentage entries in the tables are removed, and the register_sysctl
call is provided the paths of "kernel/spl", "kernel/spl/kmem", and
"kernel/spl/kstat" directly, to populate each subdirectory over three
calls, as is the new API.

Reviewed-by: Brian Atkinson <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #15138
tonyhutter pushed a commit that referenced this pull request Sep 27, 2023
@ckane @tonyhutter
Linux 6.5 compat: register_sysctl_table removed
cb115ed 
Additionally, the .child element of ctl_table has been removed in 6.5.
This change adds a new test for the pre-6.5 register_sysctl_table()
function, and uses the old code in that case. If it isn't found, then
the parentage entries in the tables are removed, and the register_sysctl
call is provided the paths of "kernel/spl", "kernel/spl/kmem", and
"kernel/spl/kstat" directly, to populate each subdirectory over three
calls, as is the new API.

Reviewed-by: Brian Atkinson <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #15138
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Dec 12, 2023
@ckane @lundman
Linux 6.5 compat: register_sysctl_table removed
da5213c 
Additionally, the .child element of ctl_table has been removed in 6.5.
This change adds a new test for the pre-6.5 register_sysctl_table()
function, and uses the old code in that case. If it isn't found, then
the parentage entries in the tables are removed, and the register_sysctl
call is provided the paths of "kernel/spl", "kernel/spl/kmem", and
"kernel/spl/kstat" directly, to populate each subdirectory over three
calls, as is the new API.

Reviewed-by: Brian Atkinson <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#15138
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bwatkinson bwatkinson bwatkinson approved these changes

@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.
3 participants
@ckane @behlendorf @bwatkinson