Set "none" scheduler if available (initramfs)

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 <behlendorf1@llnl.gov>
Reviewed-by: Garrett Fields <ghfields@gmail.com>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Signed-off-by: Colm Buckley <colm@tuatha.org>
Closes #9042
This commit is contained in:
colmbuckley 2019-08-19 23:11:47 +01:00 committed by Brian Behlendorf
parent 1a26cb6160
commit f6fbe25664
1 changed files with 13 additions and 6 deletions

View File

@ -884,20 +884,27 @@ mountroot()
ZFS_RPOOL="${pool}" ZFS_RPOOL="${pool}"
fi fi
# Set elevator=noop on the root pool's vdevs' disks. ZFS already # Set the no-op scheduler on the disks containing the vdevs of
# does this for wholedisk vdevs (for all pools), so this is only # the root pool. For single-queue devices, this scheduler is
# important for partitions. # "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 | "${ZPOOL}" status -L "${ZFS_RPOOL}" 2> /dev/null |
awk '/^\t / && !/(mirror|raidz)/ { awk '/^\t / && !/(mirror|raidz)/ {
dev=$1; dev=$1;
sub(/[0-9]+$/, "", dev); sub(/[0-9]+$/, "", dev);
print dev print dev
}' | }' |
while read i while read -r i
do do
if grep -sq noop /sys/block/$i/queue/scheduler SCHEDULER=/sys/block/$i/queue/scheduler
if [ -e "${SCHEDULER}" ]
then 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 fi
done done