Revert "cleaner: Remove complete_queue"

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 1e5eda6. Signed-off-by: Robert Baldyga <[email protected]>
Open-CAS · Jul 25, 2024 · ac6d65e · ac6d65e
1 parent 54679d7
commit ac6d65e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/ocf_request.h b/src/ocf_request.h
@@ -195,6 +195,9 @@ struct ocf_request {
 	uint8_t part_evict : 1;
 	/* !< 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;
 	/* !< Selected global metadata read lock */
 

diff --git a/src/utils/utils_cleaner.c b/src/utils/utils_cleaner.c
@@ -104,6 +104,7 @@ static struct ocf_request *_ocf_cleaner_alloc_master_req(
 	/* In master, save completion context and function */
 	req->priv = attribs->cmpl_context;
 	req->master_io_req = attribs->cmpl_fn;
+	req->complete_queue = attribs->cmpl_queue;
 
 	/* The count of all requests */
 	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;
 }
 
+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)
 {
 	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");
 
-	/* Only master contains completion function and priv */
-	cmpl = master->master_io_req;
-	cmpl(master->priv, master->error);
+	if (master->complete_queue) {
+		ocf_req_get(master);
+		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 */
 	ocf_req_put(master);
+	}
 }
 
 static void _ocf_cleaner_on_resume(struct ocf_request *req)