Skip to contentSkip to conversation

dm writecache: skip writecache_wait when using pmem mode

PATCH In review Huaisheng Ye 2 participants 2 messages Jun 12, 2020 – Jun 13, 2020 Device mapper

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dm writecache: skip writecache_wait when using pmem mode

From: Huaisheng Ye <[email protected]>

The array bio_in_progress is only used with ssd mode. So skip writecache_wait_for_ios in writecache_discard when pmem mode.

---
 drivers/md/dm-writecache.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/md/dm-writecache.c +4 -2
index 66f3a3b..4367cc7 100644
@@ -849,8 +849,10 @@ static void writecache_discard(struct dm_writecache *wc, sector_t start, sector_
 
 		if (likely(!e->write_in_progress)) {
 			if (!discarded_something) {
-				writecache_wait_for_ios(wc, READ);
-				writecache_wait_for_ios(wc, WRITE);
+				if (!WC_MODE_PMEM(wc)) {
+					writecache_wait_for_ios(wc, READ);
+					writecache_wait_for_ios(wc, WRITE);
+				}
 				discarded_something = true;
 			}
 			writecache_free_entry(wc, e);
Signature · 1 line
1.8.3.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Huaisheng Ye

From: Huaisheng Ye <[email protected]>

The array bio_in_progress is only used with ssd mode. So skip writecache_wait_for_ios in writecache_discard when pmem mode.

Quoted 24 lines
---
 drivers/md/dm-writecache.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/md/dm-writecache.c +4 -2
index 66f3a3b..4367cc7 100644
@@ -849,8 +849,10 @@ static void writecache_discard(struct dm_writecache *wc, sector_t start, sector_
 
 		if (likely(!e->write_in_progress)) {
 			if (!discarded_something) {
-				writecache_wait_for_ios(wc, READ);
-				writecache_wait_for_ios(wc, WRITE);
+				if (!WC_MODE_PMEM(wc)) {
+					writecache_wait_for_ios(wc, READ);
+					writecache_wait_for_ios(wc, WRITE);
+				}
 				discarded_something = true;
 			}
 			writecache_free_entry(wc, e);
Signature · 1 line
1.8.3.1