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

linux: 5.2-rc7 -> 5.3-rc8 #67111

Merged
merged 4 commits into from Sep 9, 2019
Merged

linux: 5.2-rc7 -> 5.3-rc8 #67111

merged 4 commits into from Sep 9, 2019

Conversation

NeQuissimus
Copy link
Member

Motivation for this change

Get ready for next mainstream kernel

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.

I had to remove the --exclude='/Documentation/' clause because I could not figure out how to make the build happy.
It will look for Documentation/KConfig and try to build that.
Somehow, I could not determine where it is actually told to look for that...

The fpu functions are now exported (under different names) and openzfs/zfs@becdcec picks them up from there


-modules := $(sort $(shell cat $(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD)/)modules.order))
+modules := $(sort $(foreach f,$(wildcard $(MODVERDIR)/*.mod),$(shell \
+ grep -h '\.ko$$' '$f')))
Copy link
Member

Choose a reason for hiding this comment

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

Hm, did you check whether this patch is still needed? Like eg. build the kernel by adding a bunch of environment variables and see whether modules are properly installed.

Copy link
Member

Choose a reason for hiding this comment

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

Hm, did you check whether this patch is still needed? Like eg. build the kernel by adding a bunch of environment variables and see whether modules are properly installed.

As it is now, AFAICT no modules actually get installed :(. Found out when went to reboot and expected modules weren't found... (somewhat surprised initrd generator didn't die during build or something,but shrug).

Removing this patch (64829de) builds and installs the modules. I'm not sure what construction was previously running into argument length limits, but via notes here: 98842f8 (which links to kernel commit changing Makefile.modinst, hence the conflict) it might be possible it's no longer a problem. Or maybe only shows up on Darwin or when cross-compiling or something O:).

Copy link
Member

@aszlig aszlig Aug 21, 2019

Choose a reason for hiding this comment

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

@dtzWill: Okay, can you please verify if it really works by adding some more environment variables to the build?

@NeQuissimus
Copy link
Member Author

@GrahamcOfBorg test kernel-testing

@NeQuissimus
Copy link
Member Author

Sorry guys, I was running the test overnight, only now saw that it wasn't quite right. Figured last night I'd get early feedback :)

@NeQuissimus
Copy link
Member Author

The test passes, I can't boot into it because my root drive is ZFS and ZOL does not yet support 5.3, so the module won't build.

@NeQuissimus NeQuissimus changed the title linux: 5.2-rc7 -> 5.3-rc5 linux: 5.2-rc7 -> 5.3-rc6 Aug 26, 2019
@Mic92
Copy link
Member

Mic92 commented Aug 27, 2019

I think zfsonlinux also implements some other workarounds for older kernels, so our patch could be removed their as well. I have not checked that though.

@Mic92
Copy link
Member

Mic92 commented Aug 27, 2019

I assume you have checked that the compile test for kernel_fpu_begin openzfs/zfs@becdcec#r34843588

succeeds?

@NeQuissimus
Copy link
Member Author

I have not attempted to make ZOL work at all

@NeQuissimus NeQuissimus changed the title linux: 5.2-rc7 -> 5.3-rc6 linux: 5.2-rc7 -> 5.3-rc7 Sep 3, 2019
@jb55
Copy link
Contributor

jb55 commented Sep 8, 2019

I got ZFS to work by updating to the proposed 0.8.2 patchset (openzfs/zfs#9161). I had to revert one path-related commit to get it working. my tree is here:

https://github.com/jb55/zfs/tree/zfs-0.8.2

I'm currently running 5.3-rc7 nixos and nothing has exploded yet

@NeQuissimus
Copy link
Member Author

@GrahamcOfBorg test kernel-testing

@NeQuissimus
Copy link
Member Author

I am going to merge this once the tests pass

@NeQuissimus NeQuissimus changed the title linux: 5.2-rc7 -> 5.3-rc7 linux: 5.2-rc7 -> 5.3-rc8 Sep 9, 2019
@dtzWill
Copy link
Member

dtzWill commented Sep 9, 2019 via email

@NeQuissimus
Copy link
Member Author

@dtzWill Already included in this PR :)

@NeQuissimus NeQuissimus merged commit 557c933 into NixOS:master Sep 9, 2019
@NeQuissimus NeQuissimus deleted the kernel_5_3 branch September 9, 2019 18:25
@knedlsepp
Copy link
Member

Will this hit 19.09 also?

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

Successfully merging this pull request may close these issues.

None yet

6 participants