Skip to content

linux/common-config: Adjust some options unavailable on i686 #384588

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

Merged
K900 merged 4 commits into from
Mar 19, 2025
Merged

linux/common-config: Adjust some options unavailable on i686 #384588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02333bc
linux/common-config: Split Rust toolchain and kernel-based conditions
timschumi Feb 27, 2025
3f646e1
linux/common-config: Spell out the current set of supported Rust targets
timschumi Feb 27, 2025
cfb4fd5
linux/common-config: Overhaul Rust for Linux enabling logic
timschumi Mar 17, 2025
d0d4a8c
linux/common-config: Guard transitive dependants on BTF_JIT
timschumi Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions pkgs/os-specific/linux/kernel/common-config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,25 @@ let
);

forceRust = features.rust or false;
kernelSupportsRust = lib.versionAtLeast version "6.7";
# Architecture support collected from HAVE_RUST Kconfig definitions and the following table:
# https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/rust/arch-support.rst
rustByDefault = (
lib.versionAtLeast version "6.12"
&& (
stdenv.hostPlatform.isx86_64
|| stdenv.hostPlatform.isLoongArch64
|| stdenv.hostPlatform.isAarch64
|| (stdenv.hostPlatform.isRiscV64 && !stdenv.cc.isGNU)
)
);

# Currently only enabling Rust by default on kernel 6.12+,
# which actually has features that use Rust that we want.
defaultRust = lib.versionAtLeast version "6.12" && rustAvailable;
withRust =
assert lib.assertMsg (!(forceRust && !kernelSupportsRust)) ''
Kernels below 6.7 (the kernel being built is ${version}) don't support Rust.
'';
(forceRust || defaultRust) && kernelSupportsRust;
lib.warnIfNot (forceRust -> rustAvailable)
"force-enabling Rust for Linux without an available rustc"
lib.warnIfNot
(forceRust -> rustByDefault)
"force-enabling Rust for Linux on an unsupported kernel version, host platform or compiler"
(forceRust || (rustAvailable && rustByDefault));

options = {

Expand Down Expand Up @@ -1054,7 +1063,7 @@ let
HIDRAW = yes;

# Enable loading HID fixups as eBPF from userspace
HID_BPF = whenAtLeast "6.3" yes;
HID_BPF = whenAtLeast "6.3" (whenPlatformHasEBPFJit yes);

HID_ACRUX_FF = yes;
DRAGONRISE_FF = yes;
Expand Down Expand Up @@ -1281,7 +1290,7 @@ let
LIRC = yes;

SCHED_CORE = whenAtLeast "5.14" yes;
SCHED_CLASS_EXT = whenAtLeast "6.12" yes;
SCHED_CLASS_EXT = whenAtLeast "6.12" (whenPlatformHasEBPFJit yes);

LRU_GEN = whenAtLeast "6.1" yes;
LRU_GEN_ENABLED = whenAtLeast "6.1" yes;
Expand Down
6 changes: 1 addition & 5 deletions pkgs/os-specific/linux/kernel/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,7 @@ let

commonStructuredConfig = import ./common-config.nix {
inherit lib stdenv version;
rustAvailable =
lib.any (lib.meta.platformMatch stdenv.hostPlatform) rustc.targetPlatforms
&& lib.all (p: !lib.meta.platformMatch stdenv.hostPlatform p) rustc.badTargetPlatforms
# Known to be broken: https://lore.kernel.org/lkml/31885EDD-EF6D-4EF1-94CA-276BA7A340B7@kernel.org/T/
&& !(stdenv.hostPlatform.isRiscV && stdenv.cc.isGNU);
rustAvailable = lib.meta.availableOn stdenv.hostPlatform rustc;

features = kernelFeatures; # Ensure we know of all extra patches, etc.
};
Expand Down