github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable adding core to detached cache instance

Browse Source 
Instead of trying to access properties of potenially unavaliable cache device
use properties saved in cache priv

Signed-off-by: Michal Mielewczyk <michal.mielewczyk@huawei.com>
This commit is contained in:
Michal Mielewczyk 2023-10-11 13:06:44 +02:00 committed by Rafal Stefanowski
parent cef13315d0
commit bb8fc64ed5
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
modules/cas_cache/volume/vol_block_dev_top.c
View File

@ -35,35 +35,29 @@ static void blkdev_set_exported_object_flush_fua(ocf_core_t core)
{ {
ocf_cache_t cache = ocf_core_get_cache(core); ocf_cache_t cache = ocf_core_get_cache(core);
ocf_volume_t core_vol = ocf_core_get_volume(core); ocf_volume_t core_vol = ocf_core_get_volume(core);
ocf_volume_t cache_vol = ocf_cache_get_volume(cache); struct bd_object *bd_core_vol;
struct bd_object *bd_core_vol, *bd_cache_vol; struct request_queue *core_q, *exp_q;
struct request_queue *core_q, *exp_q, *cache_q;
bool flush, fua; bool flush, fua;
struct cache_priv *cache_priv = ocf_cache_get_priv(cache);
BUG_ON(!cache_vol);
bd_core_vol = bd_object(core_vol); bd_core_vol = bd_object(core_vol);
bd_cache_vol = bd_object(cache_vol);
core_q = cas_disk_get_queue(bd_core_vol->dsk); core_q = cas_disk_get_queue(bd_core_vol->dsk);
exp_q = cas_exp_obj_get_queue(bd_core_vol->dsk); exp_q = cas_exp_obj_get_queue(bd_core_vol->dsk);
cache_q = cas_disk_get_queue(bd_cache_vol->dsk);
flush = (CAS_CHECK_QUEUE_FLUSH(core_q) || CAS_CHECK_QUEUE_FLUSH(cache_q)); flush = (CAS_CHECK_QUEUE_FLUSH(core_q) ||
fua = (CAS_CHECK_QUEUE_FUA(core_q) || CAS_CHECK_QUEUE_FUA(cache_q)); cache_priv->device_properties.flush);
fua = (CAS_CHECK_QUEUE_FUA(core_q) || cache_priv->device_properties.fua);
cas_set_queue_flush_fua(exp_q, flush, fua); cas_set_queue_flush_fua(exp_q, flush, fua);
} }
static void blkdev_set_discard_properties(ocf_cache_t cache, static void blkdev_set_discard_properties(ocf_cache_t cache,
struct request_queue *exp_q, struct block_device *cache_bd, struct request_queue *exp_q, struct block_device *core_bd,
struct block_device *core_bd, sector_t core_sectors) sector_t core_sectors)
{ {
struct request_queue *core_q; struct request_queue *core_q;
struct request_queue *cache_q;
core_q = bdev_get_queue(core_bd); core_q = bdev_get_queue(core_bd);
cache_q = bdev_get_queue(cache_bd);
cas_set_discard_flag(exp_q); cas_set_discard_flag(exp_q);
@ -91,38 +85,32 @@ static int blkdev_core_set_geometry(struct cas_disk *dsk, void *private)
ocf_core_t core; ocf_core_t core;
ocf_cache_t cache; ocf_cache_t cache;
ocf_volume_t core_vol; ocf_volume_t core_vol;
ocf_volume_t cache_vol; struct request_queue *core_q, *exp_q;
struct bd_object *bd_cache_vol; struct block_device *core_bd;
struct request_queue *core_q, *cache_q, *exp_q;
struct block_device *core_bd, *cache_bd;
sector_t sectors; sector_t sectors;
const char *path; const char *path;
struct cache_priv *cache_priv;
BUG_ON(!private); BUG_ON(!private);
core = private; core = private;
cache = ocf_core_get_cache(core); cache = ocf_core_get_cache(core);
core_vol = ocf_core_get_volume(core); core_vol = ocf_core_get_volume(core);
cache_vol = ocf_cache_get_volume(cache); cache_priv = ocf_cache_get_priv(cache);
BUG_ON(!cache_vol);
bd_cache_vol = bd_object(cache_vol);
path = ocf_volume_get_uuid(core_vol)->data; path = ocf_volume_get_uuid(core_vol)->data;
core_bd = cas_disk_get_blkdev(dsk); core_bd = cas_disk_get_blkdev(dsk);
BUG_ON(!core_bd); BUG_ON(!core_bd);
cache_bd = cas_disk_get_blkdev(bd_cache_vol->dsk);
BUG_ON(!cache_bd);
core_q = cas_bdev_whole(core_bd)->bd_disk->queue; core_q = cas_bdev_whole(core_bd)->bd_disk->queue;
cache_q = cache_bd->bd_disk->queue;
exp_q = cas_exp_obj_get_queue(dsk); exp_q = cas_exp_obj_get_queue(dsk);
sectors = ocf_volume_get_length(core_vol) >> SECTOR_SHIFT; sectors = ocf_volume_get_length(core_vol) >> SECTOR_SHIFT;
set_capacity(cas_exp_obj_get_gendisk(dsk), sectors); set_capacity(cas_exp_obj_get_gendisk(dsk), sectors);
cas_copy_queue_limits(exp_q, &cache_q->limits, core_q); cas_copy_queue_limits(exp_q, &cache_priv->device_properties.queue_limits,
core_q);
if (exp_q->limits.logical_block_size > if (exp_q->limits.logical_block_size >
core_q->limits.logical_block_size) { core_q->limits.logical_block_size) {
@ -139,8 +127,7 @@ static int blkdev_core_set_geometry(struct cas_disk *dsk, void *private)
blkdev_set_exported_object_flush_fua(core); blkdev_set_exported_object_flush_fua(core);
blkdev_set_discard_properties(cache, exp_q, cache_bd, core_bd, blkdev_set_discard_properties(cache, exp_q, core_bd, sectors);
sectors);
exp_q->queue_flags |= (1 << QUEUE_FLAG_NONROT); exp_q->queue_flags |= (1 << QUEUE_FLAG_NONROT);