commit 7978d240c25502fdbfe33f0d483cec77a8d82918 · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2411.section.md

···

       87
       87
        
       

     

       88
       88
        
       ## New Modules {#sec-release-24.11-new-modules}

     

       89
       89
        
       

     

       90
       90
       +
       - [hardware.block](options.html#hardware-block.defaultScheduler) allows configuration of I/O schedulers for block devices.

     

       91
       91
       +
       

     

       90
       92
        
       - [KMonad](https://github.com/kmonad/kmonad), an advanced keyboard remapping utility. Available as [services.kmonad](#opt-services.kmonad.enable).

     

       91
       93
        
       

     

       92
       94
        
       - [Coral](https://coral.ai/), hardware support for Coral.ai Edge TPU devices. Available as [hardware.coral.usb.enable](#opt-hardware.coral.usb.enable) and [hardware.coral.pcie.enable](#opt-hardware.coral.pcie.enable).

+70 -31

nixos/modules/hardware/iosched.nix

···

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       +
         inherit (lib)

     

       10
       10
       +
           concatLines

     

       11
       11
       +
           concatStringsSep

     

       12
       12
       +
           mapAttrsToList

     

       13
       13
       +
           optional

     

       14
       14
       +
           optionals

     

       15
       15
       +
       

     

       16
       16
       +
           mkIf

     

       17
       17
       +
           mkOption

     

       18
       18
       +
           types

     

       19
       19
       +
           ;

     

       20
       20
       +
       

     

       9
       21
        
         cfg = config.hardware.block;

     

       10
       22
        
         escape = lib.strings.escape [ ''"'' ];

     

       23
       23
       +
       

     

       11
       24
        
         udevValue = types.addCheck types.nonEmptyStr (x: builtins.match "[^\n\r]*" x != null) // {

     

       12
       25
        
           name = "udevValue";

     

       13
       26
        
           description = "udev rule value";

     

       14
       27
        
           descriptionClass = "noun";

     

       15
       28
        
         };

     

       16
       29
        
       

     

       17
       17
       -
         inherit (lib)

     

       18
       18
       -
           mkIf

     

       19
       19
       -
           mkOption

     

       20
       20
       -
           types

     

       21
       21
       -
       

     

       22
       22
       -
           concatLines

     

       23
       23
       -
           concatStringsSep

     

       24
       24
       -
           mapAttrsToList

     

       25
       25
       -
           optional

     

       26
       26
       -
           ;

     

       30
       30
       +
         udevRule =

     

       31
       31
       +
           {

     

       32
       32
       +
             rotational ? null,

     

       33
       33
       +
             include ? null,

     

       34
       34
       +
             exclude ? null,

     

       35
       35
       +
             scheduler,

     

       36
       36
       +
           }:

     

       37
       37
       +
           concatStringsSep ", " (

     

       38
       38
       +
             [

     

       39
       39
       +
               ''SUBSYSTEM=="block"''

     

       40
       40
       +
               ''ACTION=="add|change"''

     

       41
       41
       +
               ''TEST=="queue/scheduler"''

     

       42
       42
       +
             ]

     

       43
       43
       +
             ++ optionals (rotational != null) [

     

       44
       44
       +
               ''ATTR{queue/rotational}=="${if rotational then "1" else "0"}"''

     

       45
       45
       +
             ]

     

       46
       46
       +
             ++ optionals (include != null) [

     

       47
       47
       +
               ''KERNEL=="${escape include}"''

     

       48
       48
       +
             ]

     

       49
       49
       +
             ++ optionals (exclude != null) [

     

       50
       50
       +
               ''KERNEL!="${escape exclude}"''

     

       51
       51
       +
             ]

     

       52
       52
       +
             ++ [

     

       53
       53
       +
               ''ATTR{queue/scheduler}="${escape scheduler}"''

     

       54
       54
       +
             ]

     

       55
       55
       +
           );

     

       27
       56
        
       in

     

       28
       57
        
       {

     

       29
       58
        
         options.hardware.block = {

     
···

       54
       83
        
             example = "bfq";

     

       55
       84
        
           };

     

       56
       85
        
       

     

       86
       86
       +
           defaultSchedulerExclude = mkOption {

     

       87
       87
       +
             type = types.nullOr udevValue;

     

       88
       88
       +
             default = "loop[0-9]*";

     

       89
       89
       +
             description = ''

     

       90
       90
       +
               Device name pattern to exclude from default scheduler assignment

     

       91
       91
       +
               through {option}`config.hardware.block.defaultScheduler` and

     

       92
       92
       +
               {option}`config.hardware.block.defaultSchedulerRotational`.

     

       93
       93
       +
       

     

       94
       94
       +
               By default this excludes loop devices which generally do not benefit

     

       95
       95
       +
               from extra I/O scheduling in addition to the scheduling already

     

       96
       96
       +
               performed for their backing devices.

     

       97
       97
       +
       

     

       98
       98
       +
               This setting does not affect {option}`config.hardware.block.scheduler`.

     

       99
       99
       +
             '';

     

       100
       100
       +
           };

     

       101
       101
       +
       

     

       57
       102
        
           scheduler = mkOption {

     

       58
       103
        
             type = types.attrsOf udevValue;

     

       59
       104
        
             default = { };

     
···

       120
       165
        
               services.udev.packages = [

     

       121
       166
        
                 (pkgs.writeTextDir "etc/udev/rules.d/98-block-io-scheduler.rules" (

     

       122
       167
        
                   concatLines (

     

       123
       123
       -
                     map (concatStringsSep ", ") (

     

       124
       124
       -
                       optional (cfg.defaultScheduler != null) [

     

       125
       125
       -
                         ''SUBSYSTEM=="block"''

     

       126
       126
       -
                         ''ACTION=="add|change"''

     

       127
       127
       -
                         ''TEST=="queue/scheduler"''

     

       128
       128
       -
                         ''ATTR{queue/scheduler}="${escape cfg.defaultScheduler}"''

     

       129
       129
       -
                       ]

     

       130
       130
       -
                       ++ optional (cfg.defaultSchedulerRotational != null) [

     

       131
       131
       -
                         ''SUBSYSTEM=="block"''

     

       132
       132
       -
                         ''ACTION=="add|change"''

     

       133
       133
       -
                         ''ATTR{queue/rotational}=="1"''

     

       134
       134
       -
                         ''TEST=="queue/scheduler"''

     

       135
       135
       -
                         ''ATTR{queue/scheduler}="${escape cfg.defaultSchedulerRotational}"''

     

       136
       136
       -
                       ]

     

       137
       137
       -
                       ++ mapAttrsToList (name: sched: [

     

       138
       138
       -
                         ''SUBSYSTEM=="block"''

     

       139
       139
       -
                         ''ACTION=="add|change"''

     

       140
       140
       -
                         ''KERNEL=="${escape name}"''

     

       141
       141
       -
                         ''ATTR{queue/scheduler}="${escape sched}"''

     

       142
       142
       -
                       ]) cfg.scheduler

     

       143
       143
       -
                     )

     

       168
       168
       +
                     optional (cfg.defaultScheduler != null) (udevRule {

     

       169
       169
       +
                       exclude = cfg.defaultSchedulerExclude;

     

       170
       170
       +
                       scheduler = cfg.defaultScheduler;

     

       171
       171
       +
                     })

     

       172
       172
       +
                     ++ optional (cfg.defaultSchedulerRotational != null) (udevRule {

     

       173
       173
       +
                       rotational = true;

     

       174
       174
       +
                       exclude = cfg.defaultSchedulerExclude;

     

       175
       175
       +
                       scheduler = cfg.defaultSchedulerRotational;

     

       176
       176
       +
                     })

     

       177
       177
       +
                     ++ mapAttrsToList (

     

       178
       178
       +
                       include: scheduler:

     

       179
       179
       +
                       udevRule {

     

       180
       180
       +
                         inherit include scheduler;

     

       181
       181
       +
                       }

     

       182
       182
       +
                     ) cfg.scheduler

     

       144
       183
        
                   )

     

       145
       184
        
                 ))

     

       146
       185
        
               ];

nixos/tests/iosched.nix

···

       63
       63
        
             check_scheduler("sdb", "mq-deadline")

     

       64
       64
        
             check_scheduler("nvme0n1", "kyber")

     

       65
       65
        
             check_scheduler("mmcblk0", "bfq")

     

       66
       66
       +
       

     

       67
       67
       +
             machine.succeed("tmp=\"$(mktemp)\"; losetup /dev/loop0 \"$tmp\"")

     

       68
       68
       +
             check_scheduler("loop0", "none")

     

       66
       69
        
           '';

     

       67
       70
        
         }

     

       68
       71
        
       )