github/ocf
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #822 from mmichal10/fastpath_refactor

Browse Source 
Refactor resolving fast path
This commit is contained in:
Robert Baldyga 2024-09-12 11:57:11 +02:00 committed by GitHub
commit 297f1cb8b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/ocf_core.c
View File

@ -218,41 +218,48 @@ static void ocf_req_complete(struct ocf_request *req, int error)
ocf_io_put(&req->ioi.io); ocf_io_put(&req->ioi.io);
} }
static int ocf_core_submit_io_fast(struct ocf_io *io, struct ocf_request *req, static inline ocf_req_cache_mode_t _ocf_core_req_resolve_fast_mode(
ocf_core_t core, ocf_cache_t cache) ocf_cache_t cache, struct ocf_request *req)
{ {
ocf_req_cache_mode_t original_cache_mode; switch (req->cache_mode) {
int fast; case ocf_req_cache_mode_wb:
case ocf_req_cache_mode_wo:
return ocf_req_cache_mode_fast;
default:
break;
}
if (!cache->use_submit_io_fast)
return ocf_req_cache_mode_max;
return ocf_req_cache_mode_fast;
}
static int ocf_core_submit_io_fast(struct ocf_io *io, struct ocf_request *req,
ocf_cache_t cache)
{
ocf_req_cache_mode_t original_mode, resolved_mode;
int ret;
if (req->d2c) { if (req->d2c) {
return -OCF_ERR_IO; return OCF_FAST_PATH_NO;
} }
original_cache_mode = req->cache_mode; if (req->cache_mode == ocf_req_cache_mode_pt)
return OCF_FAST_PATH_NO;
switch (req->cache_mode) { resolved_mode = _ocf_core_req_resolve_fast_mode(cache, req);
case ocf_req_cache_mode_pt: if (resolved_mode == ocf_req_cache_mode_max)
return -OCF_ERR_IO; return OCF_FAST_PATH_NO;
case ocf_req_cache_mode_wb:
case ocf_req_cache_mode_wo:
req->cache_mode = ocf_req_cache_mode_fast;
break;
default:
if (cache->use_submit_io_fast)
break;
if (io->dir == OCF_WRITE) original_mode = req->cache_mode;
return -OCF_ERR_IO; req->cache_mode = resolved_mode;
req->cache_mode = ocf_req_cache_mode_fast; ret = ocf_engine_hndl_fast_req(req);
} if (ret == OCF_FAST_PATH_NO)
req->cache_mode = original_mode;
fast = ocf_engine_hndl_fast_req(req); return ret;
if (fast != OCF_FAST_PATH_NO)
return 0;
req->cache_mode = original_cache_mode;
return -OCF_ERR_IO;
} }
static void ocf_core_volume_submit_io(struct ocf_io *io) static void ocf_core_volume_submit_io(struct ocf_io *io)
@ -297,7 +304,7 @@ static void ocf_core_volume_submit_io(struct ocf_io *io)
/* Prevent race condition */ /* Prevent race condition */
ocf_req_get(req); ocf_req_get(req);
if (!ocf_core_submit_io_fast(io, req, core, cache)) { if (ocf_core_submit_io_fast(io, req, cache) == OCF_FAST_PATH_YES) {
ocf_core_seq_cutoff_update(core, req); ocf_core_seq_cutoff_update(core, req);
ocf_req_put(req); ocf_req_put(req);
return; return;