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

zfs: backport linux 5.8 compatibility patch to 0.8.4 release #94377

Merged
merged 1 commit into from Aug 1, 2020

Conversation

@rtreffer
Copy link
Contributor

@rtreffer rtreffer commented Jul 31, 2020

Adding this patch makes zfs compile against 5.8-rc7 kernels.

Upstream PR (merged): openzfs/zfs#10422
Modifications:

  • spl_kvmalloc does not exists in zfs 0.8.4 - related code was dropped.
Motivation for this change

I am trying to build a 5.8 kernel and zfs did not build.
There is an upstream PR that added a thin define around __vmalloc to support both the old and new interface.

This will probably turn into an issue once 5.8 is released and promoted from linuxPackages_testing.

Things done

I have build a small nixos iso image with this nixpkgs version and successfully created a zfs backed mount with the updated kernel package (kernel 5.4.54).

I have then switched the kernel to the linuxPackages_testing and created a new zfs volume (kernel 5.8-rc7).

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Adding this patch makes zfs compile against 5.8-rc7 kernels.

Upstream PR: openzfs/zfs#10422
Modifications:
- spl_kvmalloc does not exists in zfs 0.8.4 - related code was dropped.
@Mic92
Copy link
Contributor

@Mic92 Mic92 commented Jul 31, 2020

@GrahamcOfBorg test zfs

@Ma27
Ma27 approved these changes Aug 1, 2020
@Ma27 Ma27 merged commit debea4b into NixOS:master Aug 1, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0856652"; rev="08566523d88cc6fb266f7d9baa01b94b6503be95"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0856652"; rev="08566523d88cc6fb266f7d9baa01b94b6503be95"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0856652"; rev="08566523d88cc6fb266f7d9baa01b94b6503be95"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0856652"; rev="08566523d88cc6fb266f7d9baa01b94b6503be95"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0856652"; rev="08566523d88cc6fb266f7d9baa01b94b6503be95"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0856652"; rev="08566523d88cc6fb266f7d9baa01b94b6503be95"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="0856652"; rev="08566523d88cc6fb266f7d9baa01b94b6503be95"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tests.zfs on aarch64-linux Success
Details
tests.zfs on x86_64-linux Success
Details
@Ma27
Copy link
Member

@Ma27 Ma27 commented Aug 1, 2020

@rtreffer thanks!

eadwu added a commit to eadwu/nixpkgs that referenced this pull request Aug 2, 2020
…8-compatible"

This reverts commit debea4b, reversing
changes made to 1e55e22.
eadwu added a commit to eadwu/nixpkgs that referenced this pull request Aug 2, 2020
…8-compatible"

This reverts commit debea4b, reversing
changes made to 1e55e22.
eadwu added a commit to eadwu/nixpkgs that referenced this pull request Aug 2, 2020
…8-compatible"

This reverts commit debea4b, reversing
changes made to 1e55e22.
eadwu added a commit to eadwu/nixpkgs that referenced this pull request Aug 3, 2020
…8-compatible"

This reverts commit debea4b, reversing
changes made to 1e55e22.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.