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

Revert "cleaner: Remove complete_queue"

Browse Source 
This functionality is used by cleaning policies via cmpl_queue
to reschedule the completion, so that we avoid unlocking mutex in
the cleaner completion from interrupt context of IO completion.

This reverts commit 1e5eda68a7.

Signed-off-by: Robert Baldyga <robert.baldyga@huawei.com>
This commit is contained in:
Robert Baldyga 2024-07-25 16:37:06 +02:00
parent 54679d7ff7
commit 218e9c5723
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ocf_request.h
View File

@ -195,6 +195,9 @@ struct ocf_request {
uint8_t part_evict : 1; uint8_t part_evict : 1;
/* !< Some cachelines from request's partition must be evicted */ /* !< Some cachelines from request's partition must be evicted */
uint8_t complete_queue : 1;
/* !< Request needs to be completed from the queue context */
uint8_t lock_idx : OCF_METADATA_GLOBAL_LOCK_IDX_BITS; uint8_t lock_idx : OCF_METADATA_GLOBAL_LOCK_IDX_BITS;
/* !< Selected global metadata read lock */ /* !< Selected global metadata read lock */

28
src/utils/utils_cleaner.c
View File

@ -104,6 +104,7 @@ static struct ocf_request *_ocf_cleaner_alloc_master_req(
/* In master, save completion context and function */ /* In master, save completion context and function */
req->priv = attribs->cmpl_context; req->priv = attribs->cmpl_context;
req->master_io_req = attribs->cmpl_fn; req->master_io_req = attribs->cmpl_fn;
req->complete_queue = attribs->cmpl_queue;
/* The count of all requests */ /* The count of all requests */
env_atomic_set(&req->master_remaining, 1); env_atomic_set(&req->master_remaining, 1);
@ -177,6 +178,17 @@ static void _ocf_cleaner_set_error(struct ocf_request *req)
master->error = -OCF_ERR_IO; master->error = -OCF_ERR_IO;
} }
static int _ocf_cleaner_complete(struct ocf_request *master)
{
ocf_req_end_t cmpl;
cmpl = master->master_io_req;
cmpl(master->priv, master->error);
ocf_req_put(master);
return 0;
}
static void _ocf_cleaner_complete_req(struct ocf_request *req) static void _ocf_cleaner_complete_req(struct ocf_request *req)
{ {
struct ocf_request *master = NULL; struct ocf_request *master = NULL;
@ -203,12 +215,18 @@ static void _ocf_cleaner_complete_req(struct ocf_request *req)
OCF_DEBUG_MSG(req->cache, "All cleaning request completed"); OCF_DEBUG_MSG(req->cache, "All cleaning request completed");
/* Only master contains completion function and priv */ if (master->complete_queue) {
cmpl = master->master_io_req; ocf_req_get(master);
cmpl(master->priv, master->error); ocf_engine_push_req_front_cb(master,
_ocf_cleaner_complete, true);
} else {
/* Only master contains completion function and priv */
cmpl = master->master_io_req;
cmpl(master->priv, master->error);
/* For additional get on master allocation */ /* For additional get on master allocation */
ocf_req_put(master); ocf_req_put(master);
}
} }
static void _ocf_cleaner_on_resume(struct ocf_request *req) static void _ocf_cleaner_on_resume(struct ocf_request *req)