Skip to content

Commit ac5626b

Browse files
committed
[SQUASH] Drop anxiety and iosched_switcher
This reverts the following commits: 88c09ba sweet_defconfig: enable anxiety and switch to it on screen off b365957 iosched_switcher: Modding Switcher To Switch To Anxiety! 2b4f2e1 block: I/O scheduler driver mod. delay setting noop when screen goes off. 97063db iosched_switcher: Remove unneeded code in change_elevator() e8fdaef iosched_switcher: Ensure the previous elevator name is always present 2dc7556 iosched_switcher: Allow multiple block devices to be used c665579 block: Add driver to change the I/O scheduler when the screen turns off 99b0ac8 anxiety-iosched: Nornalize intendentation style fa31001 anxiety-iosched: Inform elevator about dispatched requests d8ce583 anxiety-iosched: Handle forced queue drainage 021a255 anxiety-iosched: Separate batching process out of dispatch 5402717 anxiety-iosched: Hint about NULL request unlikelyhood f36f670 anxiety-iosched: Clarify sync ratio documentation 1775d93 anxiety-iosched: Update GPL license header to SPDX a0eb362 anxiety-iosched: Update next list entry usage cb346a7 anxiety-iosched: Standardize loop iterator data type bcebde7 anxiety-iosched: Rewrite Kconfig help section fd2042b anxiety-iosched: Refactor read/write terminology 2590791 anxiety-iosched: Inline private dispatch function 64c274b anxiety-iosched: Create function for dispatch availability f34bede anxiety-iosched: Perform direct read request batching 7acd5c0 anxiety-iosched: Add low-level dispatch function 2d6491e anxiety-iosched: Update elevator function usage 697323b anxiety-iosched: Raise read ratio slightly bb50f54 anxiety-iosched: Abide by 80 character line width standard 4bbdba7 anxiety-iosched: Refactor selection functionality 285b43d anxiety-iosched: Fix improper starvation logic 239dd96 block: anxiety: Clean up queue data variable initialization 496238c block: anxiety: Use built-in former / latter handlers 1566275 block: anxiety: Add logic for sync block requests 02f9835 block: Introduce Anxiety I/O Scheduler Causes more trouble then benefits. Signed-off-by: Yahya Wessam <yahyawessam2002@gmail.com>
1 parent a557d6a commit ac5626b

File tree

6 files changed

+1
-425
lines changed

6 files changed

+1
-425
lines changed

arch/arm64/configs/sweet_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,11 +383,8 @@ CONFIG_IOSCHED_NOOP=y
383383
CONFIG_IOSCHED_DEADLINE=y
384384
CONFIG_IOSCHED_CFQ=y
385385
CONFIG_CFQ_GROUP_IOSCHED=y
386-
CONFIG_IOSCHED_ANXIETY=y
387-
CONFIG_IOSCHED_SWITCHER=y
388386
# CONFIG_DEFAULT_DEADLINE is not set
389387
CONFIG_DEFAULT_CFQ=y
390-
# CONFIG_DEFAULT_ANXIETY is not set
391388
# CONFIG_DEFAULT_NOOP is not set
392389
CONFIG_DEFAULT_IOSCHED="cfq"
393390
CONFIG_MQ_IOSCHED_DEADLINE=y

block/Kconfig.iosched

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,30 +40,6 @@ config CFQ_GROUP_IOSCHED
4040
---help---
4141
Enable group IO scheduling in CFQ.
4242

43-
config IOSCHED_ANXIETY
44-
tristate "Anxiety I/O Scheduler"
45-
default y
46-
---help---
47-
Anxiety is a low-latency I/O scheduler designed for use in
48-
embedded devices with flash storage. It attempts to provide
49-
unfair request bias, batching synchronous requests together
50-
at the expense of delaying asyncrhonous requests. By
51-
definition, synchronous requests are essentially "holding up"
52-
the current processes until they are dispatched. By biasing
53-
and batching synchronous requests, process initialization is
54-
expedited.
55-
56-
config IOSCHED_SWITCHER
57-
bool "Use Anxiety while the screen is off"
58-
depends on IOSCHED_ANXIETY
59-
---help---
60-
This enables a driver that switches the I/O scheduler for a single
61-
block device to Noop when the screen turns off, and back to its
62-
original I/O scheduler after a delay when the screen is turned back
63-
on. It requires being manually initialized from a different driver
64-
in order to grab the request_queue pointer that should have its I/O
65-
scheduler switched to Noop when the screen turns off.
66-
6743
choice
6844

6945
prompt "Default I/O scheduler"
@@ -78,17 +54,13 @@ choice
7854
config DEFAULT_CFQ
7955
bool "CFQ" if IOSCHED_CFQ=y
8056

81-
config DEFAULT_ANXIETY
82-
bool "Anxiety" if IOSCHED_ANXIETY=y
83-
8457
config DEFAULT_NOOP
8558
bool "No-op"
8659

8760
endchoice
8861

8962
config DEFAULT_IOSCHED
9063
string
91-
default "anxiety" if DEFAULT_ANXIETY
9264
default "deadline" if DEFAULT_DEADLINE
9365
default "cfq" if DEFAULT_CFQ
9466
default "noop" if DEFAULT_NOOP

block/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o
2020
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
2121
obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
2222
obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
23-
obj-$(CONFIG_IOSCHED_ANXIETY) += anxiety-iosched.o
2423
obj-$(CONFIG_MQ_IOSCHED_DEADLINE) += mq-deadline.o
2524
obj-$(CONFIG_MQ_IOSCHED_KYBER) += kyber-iosched.o
2625
bfq-y := bfq-iosched.o bfq-wf2q.o bfq-cgroup.o
2726
obj-$(CONFIG_IOSCHED_BFQ) += bfq.o
2827

29-
obj-$(CONFIG_IOSCHED_SWITCHER) += iosched_switcher.o
3028
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
3129
obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o
3230
obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o
@@ -39,4 +37,4 @@ obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o
3937
obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o
4038
obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += keyslot-manager.o bio-crypt-ctx.o \
4139
blk-crypto.o
42-
obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) += blk-crypto-fallback.o
40+
obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) += blk-crypto-fallback.o

block/anxiety-iosched.c

Lines changed: 0 additions & 227 deletions
This file was deleted.

0 commit comments

Comments
 (0)