Dynamic I/O queue management

- Queue allocation is now separated from starting cache.
- Queue can be created and destroyed in runtime.
- All queue ops accept queue handle instead of queue id.
- Cache stores queues as list instead of array.

Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>

src/utils/utils_cleaner.c

@@ -37,8 +37,8 @@
 static struct ocf_request *_ocf_cleaner_alloc_req(struct ocf_cache *cache,
 		uint32_t count, const struct ocf_cleaner_attribs *attribs)
 {
-	struct ocf_request *req = ocf_req_new_extended(cache, 0, 0,
-			count * ocf_line_size(cache), OCF_READ);
+	struct ocf_request *req = ocf_req_new_extended(attribs->io_queue, NULL,
+			0, count * ocf_line_size(cache), OCF_READ);
 	int ret;
 
 	if (!req)
@@ -62,8 +62,6 @@ static struct ocf_request *_ocf_cleaner_alloc_req(struct ocf_cache *cache,
 		return NULL;
 	}
 
-	req->io_queue = attribs->io_queue;
-
 	return req;
 }
 

src/utils/utils_cleaner.h

@@ -43,7 +43,7 @@ struct ocf_cleaner_attribs {
 		 * to iterate over items
 		 */
 
-	uint32_t io_queue;
+	ocf_queue_t io_queue;
 };
 
 /**

src/utils/utils_req.c

@@ -8,6 +8,7 @@
 #include "utils_cache_line.h"
 #include "../ocf_request.h"
 #include "../ocf_cache_priv.h"
+#include "../ocf_queue_priv.h"
 
 #define OCF_UTILS_RQ_DEBUG 0
 
@@ -165,10 +166,11 @@ static void start_cache_req(struct ocf_request *req)
 	}
 }
 
-struct ocf_request *ocf_req_new(struct ocf_cache *cache,
-		ocf_core_id_t core_id, uint64_t addr, uint32_t bytes, int rw)
+struct ocf_request *ocf_req_new(ocf_queue_t queue, ocf_core_t core,
+		uint64_t addr, uint32_t bytes, int rw)
 {
 	uint64_t core_line_first, core_line_last, core_line_count;
+	ocf_cache_t cache = queue->cache;
 	struct ocf_request *req;
 	env_allocator *allocator;
 
@@ -197,14 +199,17 @@ struct ocf_request *ocf_req_new(struct ocf_cache *cache,
 
 	OCF_DEBUG_TRACE(cache);
 
+	ocf_queue_get(queue);
+	req->io_queue = queue;
+
+	/* TODO: Store core pointer instead of id */
+	req->core_id = core ? ocf_core_get_id(core) : 0;
 	req->cache = cache;
 
 	env_atomic_inc(&cache->pending_requests);
 	start_cache_req(req);
 
-	req->io_queue = 0;
 	env_atomic_set(&req->ref_count, 1);
-	req->core_id = core_id;
 
 	req->byte_position = addr;
 	req->byte_length = bytes;
@@ -232,12 +237,12 @@ int ocf_req_alloc_map(struct ocf_request *req)
 	return 0;
 }
 
-struct ocf_request *ocf_req_new_extended(struct ocf_cache *cache,
-		ocf_core_id_t core_id, uint64_t addr, uint32_t bytes, int rw)
+struct ocf_request *ocf_req_new_extended(ocf_queue_t queue, ocf_core_t core,
+		uint64_t addr, uint32_t bytes, int rw)
 {
 	struct ocf_request *req;
 
-	req = ocf_req_new(cache, core_id, addr, bytes, rw);
+	req = ocf_req_new(queue, core, addr, bytes, rw);
 
 	if (likely(req) && ocf_req_alloc_map(req)) {
 		ocf_req_put(req);
@@ -247,14 +252,13 @@ struct ocf_request *ocf_req_new_extended(struct ocf_cache *cache,
 	return req;
 }
 
-struct ocf_request *ocf_req_new_discard(struct ocf_cache *cache,
-		ocf_core_id_t core_id, uint64_t addr, uint32_t bytes, int rw)
+struct ocf_request *ocf_req_new_discard(ocf_queue_t queue, ocf_core_t core,
+		uint64_t addr, uint32_t bytes, int rw)
 {
 	struct ocf_request *req;
 
-	req = ocf_req_new_extended(cache, core_id, addr,
-			OCF_MIN(bytes, MAX_TRIM_RQ_SIZE),rw);
-
+	req = ocf_req_new_extended(queue, core, addr,
+			OCF_MIN(bytes, MAX_TRIM_RQ_SIZE), rw);
 	if (!req)
 		return NULL;
 
@@ -279,6 +283,8 @@ void ocf_req_put(struct ocf_request *req)
 	if (env_atomic_dec_return(&req->ref_count))
 		return;
 
+	ocf_queue_put(req->io_queue);
+
 	OCF_DEBUG_TRACE(req->cache);
 
 	if (!req->d2c && !env_atomic_dec_return(

src/utils/utils_req.h

@@ -33,16 +33,16 @@ void ocf_req_allocator_deinit(struct ocf_ctx *ocf_ctx);
 /**
  * @brief Allocate new OCF request
  *
- * @param cache - OCF cache instance
- * @param core_id - Core id
+ * @param queue - I/O queue handle
+ * @param core - OCF core instance
  * @param addr - LBA of request
  * @param bytes - number of bytes of request
  * @param rw - Read or Write
  *
  * @return new OCF request
  */
-struct ocf_request *ocf_req_new(struct ocf_cache *cache,
-		ocf_core_id_t core_id, uint64_t addr, uint32_t bytes, int rw);
+struct ocf_request *ocf_req_new(ocf_queue_t queue, ocf_core_t core,
+		uint64_t addr, uint32_t bytes, int rw);
 
 /**
  * @brief Allocate OCF request map
@@ -57,8 +57,8 @@ int ocf_req_alloc_map(struct ocf_request *req);
 /**
  * @brief Allocate new OCF request with NOIO map allocation for huge request
  *
- * @param cache - OCF cache instance
- * @param core_id - Core id
+ * @param queue - I/O queue handle
+ * @param core - OCF core instance
  * @param addr - LBA of request
  * @param bytes - number of bytes of request
  * @param rw - Read or Write
@@ -66,22 +66,22 @@ int ocf_req_alloc_map(struct ocf_request *req);
  * @return new OCF request
  */
 
-struct ocf_request *ocf_req_new_extended(struct ocf_cache *cache,
-		ocf_core_id_t core_id, uint64_t addr, uint32_t bytes, int rw);
+struct ocf_request *ocf_req_new_extended(ocf_queue_t queue, ocf_core_t core,
+		uint64_t addr, uint32_t bytes, int rw);
 
 /**
  * @brief Allocate new OCF request for DISCARD operation
  *
- * @param cache - OCF cache instance
- * @param core_id - Core id
+ * @param queue - I/O queue handle
+ * @param core - OCF core instance
  * @param addr - LBA of request
  * @param bytes - number of bytes of request
  * @param rw - Read or Write
  *
  * @return new OCF request
  */
-struct ocf_request *ocf_req_new_discard(struct ocf_cache *cache,
-		ocf_core_id_t core_id, uint64_t addr, uint32_t bytes, int rw);
+struct ocf_request *ocf_req_new_discard(ocf_queue_t queue, ocf_core_t core,
+		uint64_t addr, uint32_t bytes, int rw);
 
 /**
  * @brief Get number of allocated requests