Merge pull request #726 from arutk/fipm

flush handling fixes and enhanced tests

src/engine/engine_ops.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2012-2021 Intel Corporation
+ * Copyright(c) 2012-2022 Intel Corporation
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include "ocf/ocf.h"
@@ -37,10 +37,6 @@ static void _ocf_engine_ops_complete(struct ocf_request *req, int error)
 
 int ocf_engine_ops(struct ocf_request *req)
 {
-	struct ocf_cache *cache = req->cache;
-
-	OCF_DEBUG_TRACE(req->cache);
-
 	/* Get OCF request - increase reference counter */
 	ocf_req_get(req);
 
@@ -51,8 +47,9 @@ int ocf_engine_ops(struct ocf_request *req)
 	ocf_submit_volume_req(&req->core->volume, req,
 			_ocf_engine_ops_complete);
 
-	ocf_submit_cache_reqs(cache, req, req->rw, 0, req->byte_length,
-			1, _ocf_engine_ops_complete);
+
+	/* submit flush to cache device */
+	ocf_submit_cache_flush(req,  _ocf_engine_ops_complete);
 
 	/* Put OCF request - decrease reference counter */
 	ocf_req_put(req);

src/utils/utils_io.c

@@ -224,6 +224,23 @@ static void ocf_submit_volume_req_cmpl(struct ocf_io *io, int error)
 	ocf_io_put(io);
 }
 
+void ocf_submit_cache_flush(struct ocf_request *req, ocf_req_end_t callback)
+{
+	uint64_t flags = req->ioi.io.flags;
+	struct ocf_io *io;
+
+	io = ocf_new_cache_io(req->cache, req->io_queue, 0, 0, OCF_WRITE, 0,
+			flags);
+	if (!io) {
+		callback(req, -OCF_ERR_NO_MEM);
+		return;
+	}
+
+	ocf_io_set_cmpl(io, req, callback, ocf_submit_volume_req_cmpl);
+
+	ocf_volume_submit_flush(io);
+}
+
 void ocf_submit_cache_reqs(struct ocf_cache *cache,
 		struct ocf_request *req, int dir, uint64_t offset,
 		uint64_t size, unsigned int reqs, ocf_req_end_t callback)

src/utils/utils_io.h

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2012-2021 Intel Corporation
+ * Copyright(c) 2012-2022 Intel Corporation
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
@@ -64,6 +64,8 @@ void ocf_submit_cache_reqs(struct ocf_cache *cache,
 		struct ocf_request *req, int dir, uint64_t offset,
 		uint64_t size, unsigned int reqs, ocf_req_end_t callback);
 
+void ocf_submit_cache_flush(struct ocf_request *req, ocf_req_end_t callback);
+
 static inline struct ocf_io *ocf_new_cache_io(ocf_cache_t cache,
 		ocf_queue_t queue, uint64_t addr, uint32_t bytes,
 		uint32_t dir, uint32_t io_class, uint64_t flags)