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

Kernel config: use PREEMPT_VOLUNTARY #61162

Merged
merged 2 commits into from May 14, 2019

Conversation

@lheckemann
Copy link
Member

commented May 8, 2019

Motivation for this change

zfsonlinux/zfs#8545

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

lheckemann added some commits May 8, 2019

kernel/common-config: move criu to its own set
It was previously in the "test" set, which seemed an inappropriate
placement.
@lheckemann

This comment has been minimized.

Copy link
Member Author

commented May 9, 2019

@GrahamcOfBorg build linuxPackages_5_0.zfs linuxPackages_5_1.zfs linuxPackages.zfs

one more try (timed out on x86_64)!

@lheckemann

This comment has been minimized.

Copy link
Member Author

commented May 9, 2019

Ah yes, this needs #61181 as well for it to actually fix the spl build. #61181 is now merged

@lheckemann

This comment has been minimized.

Copy link
Member Author

commented May 13, 2019

cc @thoughtpolice who seems to be the only maintainer listed for the kernel, @NeQuissimus who does a lot of kernel stuff

@joachifm

This comment has been minimized.

Copy link
Contributor

commented May 14, 2019

Hm, perhaps I'm missing something but on master I get

% grep PREEMPT $(nix-build -A linux_latest.configfile)
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
@lheckemann

This comment has been minimized.

Copy link
Member Author

commented May 14, 2019

@joachifm it only seems to default to y on aarch64.

@NeQuissimus

This comment has been minimized.

Copy link
Member

commented May 14, 2019

LGTM

@lheckemann lheckemann merged commit 1d37727 into NixOS:master May 14, 2019

14 of 16 checks passed

linuxPackages.zfs, linuxPackages_5_0.zfs, linuxPackages_5_1.zfs on x86_64-darwin No attempt
Details
linuxPackages.zfs, linuxPackages_5_0.zfs, linuxPackages_5_1.zfs on x86_64-linux Timed out, unknown build status
Details
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="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
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
linuxPackages.zfs, linuxPackages_5_0.zfs, linuxPackages_5_1.zfs on aarch64-linux Success
Details

lheckemann added a commit that referenced this pull request May 14, 2019

@thoughtpolice

This comment has been minimized.

Copy link
Member

commented May 14, 2019

Sorry about the miss here @lheckemann, thanks for the patch! LGTM.

@lheckemann lheckemann deleted the lheckemann:kernel-preempt-voluntary branch May 15, 2019

@digitalsignalperson

This comment has been minimized.

Copy link

commented Jun 13, 2019

hi folks, wondering about that 2d44588 commit added after the merge (use preempt voluntary only for aarch64)
If the zfs problem is isolated to aarch64, can we keep PREEMPT instead of voluntary for better default x86_64 realtime performance?

@lheckemann

This comment has been minimized.

Copy link
Member Author

commented Jun 13, 2019

@digitalsignalperson the main reason for applying it only to aarch64 was to minimise the amount of changes to the extent that nothing even gets rebuilt on x86_64. I'd suggest setting CONFIG_PREEMPT_VOLUNTARY to lib.mkForce no for musnix, and stick to the upstream default in nixpkgs itself.

@digitalsignalperson

This comment has been minimized.

Copy link

commented Jun 13, 2019

@lheckemann Sorry I think I'm confused. It looks to me that 1d37727 was merged into master which applies the change to both x86_64 and aarch64. Is that not the case?

@digitalsignalperson

This comment has been minimized.

Copy link

commented Jun 14, 2019

in other words, on my x86_64 system on nixos-unstable, output from zgrep PREEMPT /proc/config.gz includes

CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
@lheckemann

This comment has been minimized.

Copy link
Member Author

commented Jun 14, 2019

@digitalsignalperson yes, that is correct, however this was already the case before 1d37727, the only change being that it's now defined explicitly rather than coming from the kernel defconfig.

@digitalsignalperson

This comment has been minimized.

Copy link

commented Jun 14, 2019

Ah, I see. Thanks for clarifying

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.