Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[dm-cache] Make the mq policy an alias for smq
smq seems to be performing better than the old mq policy in all
situations, as well as using a quarter of the memory.

This patch makes 'mq' and alias for 'smq' when choosing a cache
policy.  The tunables that were present for the old mq are faked, and
have no effect.  mq should be considered deprecated now.
  • Loading branch information
jthornber committed Feb 10, 2016
1 parent 89d506e commit 9b0d197
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 1,487 deletions.
11 changes: 4 additions & 7 deletions drivers/md/Kconfig
Expand Up @@ -296,14 +296,11 @@ config DM_CACHE
cleaned etc. It supports writeback and writethrough modes.

config DM_CACHE_MQ
tristate "MQ Cache Policy (EXPERIMENTAL)"
depends on DM_CACHE
default y
tristate "MQ Cache Policy (DEPRECATED)"
depends on DM_CACHE_SMQ
default n
---help---
A cache policy that uses a multiqueue ordered by recent hit
count to select which blocks should be promoted and demoted.
This is meant to be a general purpose policy. It prioritises
reads over writes.
This policy is now an alias for the SMQ policy.

config DM_CACHE_SMQ
tristate "Stochastic MQ Cache Policy (EXPERIMENTAL)"
Expand Down
2 changes: 0 additions & 2 deletions drivers/md/Makefile
Expand Up @@ -12,7 +12,6 @@ dm-log-userspace-y \
+= dm-log-userspace-base.o dm-log-userspace-transfer.o
dm-thin-pool-y += dm-thin.o dm-thin-metadata.o
dm-cache-y += dm-cache-target.o dm-cache-metadata.o dm-cache-policy.o
dm-cache-mq-y += dm-cache-policy-mq.o
dm-cache-smq-y += dm-cache-policy-smq.o
dm-cache-cleaner-y += dm-cache-policy-cleaner.o
dm-era-y += dm-era-target.o
Expand Down Expand Up @@ -54,7 +53,6 @@ obj-$(CONFIG_DM_RAID) += dm-raid.o
obj-$(CONFIG_DM_THIN_PROVISIONING) += dm-thin-pool.o
obj-$(CONFIG_DM_VERITY) += dm-verity.o
obj-$(CONFIG_DM_CACHE) += dm-cache.o
obj-$(CONFIG_DM_CACHE_MQ) += dm-cache-mq.o
obj-$(CONFIG_DM_CACHE_SMQ) += dm-cache-smq.o
obj-$(CONFIG_DM_CACHE_CLEANER) += dm-cache-cleaner.o
obj-$(CONFIG_DM_ERA) += dm-era.o
Expand Down

0 comments on commit 9b0d197

Please sign in to comment.