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.

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

[backport] 4.8, 5.16, and 5.17 compat patches #13058

Merged
merged 8 commits into from
Feb 4, 2022
Merged

[backport] 4.8, 5.16, and 5.17 compat patches #13058

merged 8 commits into from
Feb 4, 2022

Conversation

jonathonf
Copy link
Contributor

Motivation and Context

This PR backports a number of compat patches to the 2.1.* series

Description

Cherry-picks:

How Has This Been Tested?

5.16 and 5.17 compat patches tested on Arch Linux.
5.16 compat patches tested on Ubuntu 18.04.

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:

@jonathonf
Copy link
Contributor Author

5.16 compat patches are working fine (and have been since they were merged to master).

5.17 patches seem to be working fine with 5.17rc2. I'll give it another 24 hours or so before removing draft status.

@AttilaFueloep
Copy link
Contributor

Once it is merged, you may want to include #13059 as well.

@jonathonf jonathonf marked this pull request as ready for review February 3, 2022 21:58
@tonyhutter
Copy link
Contributor

tonyhutter commented Feb 3, 2022

Thank you for these backports. I see that you added:

    (cherry picked from commit [hash])
    Signed-off-by: Jonathon Fernyhough <jonathon@m2x.dev>

... to all the commit messages. Historically, we don't change the commit message when backporting (unless there was some weird special case that needed to be documented). Would you mind removing it just for consistency?

Otherwise, these look good to go.

@jonathonf
Copy link
Contributor Author

Oops, I got that as "best practice" from somewhere. I'll force-push.

rincebrain and others added 8 commits February 4, 2022 02:05
As it says on the tin - the folio work moved a bunch out of mm.h.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Coleman Kane <ckane@colemankane.org>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #12975
add_disk went from void to must-check int return.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Coleman Kane <ckane@colemankane.org>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #12975
Linux decided to rename this for some reason. At some point, we
should probably invert this mapping, but for now...

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Coleman Kane <ckane@colemankane.org>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #12975
For us, I think it's always just FALLOC_FL_PUNCH_HOLE with a fake
mustache on.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Coleman Kane <ckane@colemankane.org>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #12975
Linux 5.17 sees a rename from complete_and_exit()
to kthread complete_and_exit()

Upstream commit cead18552660702a4a46f58e65188fe5f36e9dfe
("exit: Rename complete_and_exit to kthread_complete_and_exit")

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12989
Linux 5.17's dequeue_signal() takes an additional enum pid_type *
output argument

Upstream commit 5768d8906bc23d512b1a736c1e198aa833a6daa4
("signal: Requeue signals in the appropriate queue")

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12989
Upstream commit 359745d78351c6f5442435f81549f0207ece28aa
("proc: remove PDE_DATA() completely")

Link: https://lore.kernel.org/all/20211124081956.87711-2-songmuchun@bytedance.com/T/#u

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13004
Closes #12989
When using the two argument version of submit_bio() in kernel's prior
to 4.8 the first argument should be specified.  It's used by block
dump to report the bio direction.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Finix Yan <yancw@info2soft.com>
Closes #13006
@tonyhutter tonyhutter merged commit 1009e60 into openzfs:zfs-2.1.3-staging Feb 4, 2022
Copy link
Contributor

@tonyhutter tonyhutter left a comment

Choose a reason for hiding this comment

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

Thanks @jonathonf

@imwhocodes
Copy link

Hi @jonathonf

Sorry to bother you here, I know it is not the most appropriate channel but do you have any plan for more release of ZoL scheduled for your Ubuntu-PPA? Last version in this repo is 5 fix/patch releases ahead

I'm having some problem (mostly random total OS freezes when on heavy load on high zstd-compression and high block-size dataset ) and it would be nice to have up-to-date ZFS on Ubuntu to see if this problem have been already addressed (I saw some commit that could be related)

Sorry again and
Really thank you for your time

@gmelikov
Copy link
Member

@imwhocodes unfortunately, https://www.google.com/search?q=Jonathon+Fernyhough+death

I didn't hear if anybody tried to fork his PPA, too.

@imwhocodes
Copy link

Sorry,
I didn't know his surname and that he was a so important and active figure in the open-source community

I'm deeply sorry

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants