Skip to content

Commit 3383f16

Browse files
yangdongshenggregkh
authored andcommitted
dm-pcache: advance slot index before writing slot
commit ebbb903 upstream. In dm-pcache, in order to ensure crash-consistency, a dual-copy scheme is used to alternately update metadata, and there is a slot index that records the current slot. However, in the write path the current implementation writes directly to the current slot indexed by slot index, and then advances the slot — which ends up overwriting the existing slot, violating the crash-consistency guarantee. This patch fixes that behavior, preventing metadata from being overwritten incorrectly. In addition, this patch add a missing pmem_wmb() after memcpy_flushcache(). Signed-off-by: Dongsheng Yang <dongsheng.yang@linux.dev> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Reviewed-by: Zheng Gu <cengku@gmail.com> Cc: stable@vger.kernel.org # 6.18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c8f810e commit 3383f16

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

drivers/md/dm-pcache/cache.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ static void cache_info_write(struct pcache_cache *cache)
2121
cache_info->header.crc = pcache_meta_crc(&cache_info->header,
2222
sizeof(struct pcache_cache_info));
2323

24+
cache->info_index = (cache->info_index + 1) % PCACHE_META_INDEX_MAX;
2425
memcpy_flushcache(get_cache_info_addr(cache), cache_info,
2526
sizeof(struct pcache_cache_info));
26-
27-
cache->info_index = (cache->info_index + 1) % PCACHE_META_INDEX_MAX;
27+
pmem_wmb();
2828
}
2929

3030
static void cache_info_init_default(struct pcache_cache *cache);
@@ -93,10 +93,10 @@ void cache_pos_encode(struct pcache_cache *cache,
9393
pos_onmedia.header.seq = seq;
9494
pos_onmedia.header.crc = cache_pos_onmedia_crc(&pos_onmedia);
9595

96+
*index = (*index + 1) % PCACHE_META_INDEX_MAX;
97+
9698
memcpy_flushcache(pos_onmedia_addr, &pos_onmedia, sizeof(struct pcache_cache_pos_onmedia));
9799
pmem_wmb();
98-
99-
*index = (*index + 1) % PCACHE_META_INDEX_MAX;
100100
}
101101

102102
int cache_pos_decode(struct pcache_cache *cache,

drivers/md/dm-pcache/cache_segment.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ static void cache_seg_info_write(struct pcache_cache_segment *cache_seg)
2626
seg_info->header.seq++;
2727
seg_info->header.crc = pcache_meta_crc(&seg_info->header, sizeof(struct pcache_segment_info));
2828

29+
cache_seg->info_index = (cache_seg->info_index + 1) % PCACHE_META_INDEX_MAX;
30+
2931
seg_info_addr = get_seg_info_addr(cache_seg);
3032
memcpy_flushcache(seg_info_addr, seg_info, sizeof(struct pcache_segment_info));
3133
pmem_wmb();
32-
33-
cache_seg->info_index = (cache_seg->info_index + 1) % PCACHE_META_INDEX_MAX;
3434
mutex_unlock(&cache_seg->info_lock);
3535
}
3636

@@ -129,10 +129,10 @@ static void cache_seg_ctrl_write(struct pcache_cache_segment *cache_seg)
129129
cache_seg_gen.header.crc = pcache_meta_crc(&cache_seg_gen.header,
130130
sizeof(struct pcache_cache_seg_gen));
131131

132+
cache_seg->gen_index = (cache_seg->gen_index + 1) % PCACHE_META_INDEX_MAX;
133+
132134
memcpy_flushcache(get_cache_seg_gen_addr(cache_seg), &cache_seg_gen, sizeof(struct pcache_cache_seg_gen));
133135
pmem_wmb();
134-
135-
cache_seg->gen_index = (cache_seg->gen_index + 1) % PCACHE_META_INDEX_MAX;
136136
}
137137

138138
static void cache_seg_ctrl_init(struct pcache_cache_segment *cache_seg)

0 commit comments

Comments
 (0)