Skip to content

Commit

Permalink
Set "none" scheduler if available (initramfs)
Browse files Browse the repository at this point in the history
Existing zfs initramfs script logic will attempt to set the 'noop'
scheduler if it's available on the vdev block devices. Newer kernels
have the similar 'none' scheduler on multiqueue devices; this change
alters the initramfs script logic to also attempt to set this scheduler
if it's available.

Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Garrett Fields <[email protected]>
Reviewed-by: Richard Laager <[email protected]>
Signed-off-by: Colm Buckley <[email protected]>
Closes #9042
  • Loading branch information
colmbuckley authored and tonyhutter committed Jan 22, 2020
1 parent 72dbc01 commit ed235de
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions contrib/initramfs/scripts/zfs.in
Original file line number Diff line number Diff line change
Expand Up @@ -884,20 +884,27 @@ mountroot()
ZFS_RPOOL="${pool}"
fi

# Set elevator=noop on the root pool's vdevs' disks. ZFS already
# does this for wholedisk vdevs (for all pools), so this is only
# important for partitions.
# Set the no-op scheduler on the disks containing the vdevs of
# the root pool. For single-queue devices, this scheduler is
# "noop", for multi-queue devices, it is "none".
# ZFS already does this for wholedisk vdevs (for all pools), so this
# is only important for partitions.
"${ZPOOL}" status -L "${ZFS_RPOOL}" 2> /dev/null |
awk '/^\t / && !/(mirror|raidz)/ {
dev=$1;
sub(/[0-9]+$/, "", dev);
print dev
}' |
while read i
while read -r i
do
if grep -sq noop /sys/block/$i/queue/scheduler
SCHEDULER=/sys/block/$i/queue/scheduler
if [ -e "${SCHEDULER}" ]
then
echo noop > "/sys/block/$i/queue/scheduler"
# Query to see what schedulers are available
case "$(cat "${SCHEDULER}")" in
*noop*) echo noop > "${SCHEDULER}" ;;
*none*) echo none > "${SCHEDULER}" ;;
esac
fi
done

Expand Down

0 comments on commit ed235de

Please sign in to comment.