Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 128a6e63 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "block: Enable BFQ IO-Scheduler as default"

parents 6422a30d 40b23718

arch/arm64/configs/vendor/lito-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ CONFIG_MODULE_SIG_SHA512=y 
CONFIG_PARTITION_ADVANCED=y

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y

arch/arm64/configs/vendor/lito_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=17 
CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_DEBUG_BLK_CGROUP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y
@@ -100,6 +101,8 @@ CONFIG_MODULE_SIG_SHA512=y 
CONFIG_PARTITION_ADVANCED=y

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y

block/elevator.c

+9 −5
Original line number Diff line number Diff line
@@ -989,11 +989,15 @@ int elevator_init_mq(struct request_queue *q) 
	mutex_lock(&q->sysfs_lock);

	if (unlikely(q->elevator))

		goto out_unlock;



	if (IS_ENABLED(CONFIG_IOSCHED_BFQ)) {

		e = elevator_get(q, "bfq", false);

		if (!e)

			goto out_unlock;

	} else {

		e = elevator_get(q, "mq-deadline", false);

		if (!e)

			goto out_unlock;



	}

	err = blk_mq_init_sched(q, e);

	if (err)

		elevator_put(e);