Skip to content

Commit ee76331

Browse files
FirstLoveLifeMikulas Patocka
authored andcommitted
dm pcache: fix cache info indexing
The on-media cache_info index used sizeof(struct) instead of the 4K metadata stride, so gc_percent updates from dmsetup message were written between slots and lost after reboot. Use PCACHE_CACHE_INFO_SIZE in get_cache_info_addr() and align info_index with the slot returned by pcache_meta_find_latest(). Signed-off-by: Li Chen <chenl311@chinatelecom.cn> 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
1 parent ebbb903 commit ee76331

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/md/dm-pcache/cache.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ struct kmem_cache *key_cache;
1010

1111
static inline struct pcache_cache_info *get_cache_info_addr(struct pcache_cache *cache)
1212
{
13-
return cache->cache_info_addr + cache->info_index;
13+
return (struct pcache_cache_info *)((char *)cache->cache_info_addr +
14+
(size_t)cache->info_index * PCACHE_CACHE_INFO_SIZE);
1415
}
1516

1617
static void cache_info_write(struct pcache_cache *cache)
@@ -49,6 +50,8 @@ static int cache_info_init(struct pcache_cache *cache, struct pcache_cache_optio
4950
return -EINVAL;
5051
}
5152

53+
cache->info_index = ((char *)cache_info_addr - (char *)cache->cache_info_addr) / PCACHE_CACHE_INFO_SIZE;
54+
5255
return 0;
5356
}
5457

0 commit comments

Comments
 (0)