Merge pull request #1657 from TaranovK/kotaranov/memory_helper

providers/mana: use helpers to (de-)allocate memory

Author: rleon

providers/mana/cq.c

@@ -100,7 +100,7 @@ struct ibv_cq *mana_create_cq(struct ibv_context *context, int cqe,
 	if (cq->buf_external)
 		ctx->extern_alloc.free(cq->buf, ctx->extern_alloc.data);
 	else
-		munmap(cq->buf, cq_size);
+		mana_dealloc_mem(cq->buf, cq_size);
 free_cq:
 	free(cq);
 	return NULL;
@@ -125,7 +125,7 @@ int mana_destroy_cq(struct ibv_cq *ibcq)
 	if (cq->buf_external)
 		ctx->extern_alloc.free(cq->buf, ctx->extern_alloc.data);
 	else
-		munmap(cq->buf, cq->cqe * COMP_ENTRY_SIZE);
+		mana_dealloc_mem(cq->buf, cq->cqe * COMP_ENTRY_SIZE);
 
 	free(cq);
 

providers/mana/mana.c

@@ -35,7 +35,7 @@ struct mana_context *to_mctx(struct ibv_context *ibctx)
 	return container_of(ibctx, struct mana_context, ibv_ctx.context);
 }
 
-void *mana_alloc_mem(uint32_t size)
+void *mana_alloc_mem(size_t size)
 {
 	void *buf;
 
@@ -44,7 +44,44 @@ void *mana_alloc_mem(uint32_t size)
 
 	if (buf == MAP_FAILED)
 		return NULL;
+
+	if (ibv_dontfork_range(buf, size))
+		goto unmap;
+
 	return buf;
+
+unmap:
+	munmap(buf, size);
+	return NULL;
+}
+
+void mana_dealloc_mem(void *buf, size_t size)
+{
+	ibv_dofork_range(buf, size);
+	munmap(buf, size);
+}
+
+int create_shadow_queue(struct shadow_queue *queue, uint32_t length, uint32_t stride)
+{
+	length = roundup_pow_of_two(length);
+	stride = align(stride, 8);
+
+	queue->buffer = mana_alloc_mem(stride * length);
+	if (!queue->buffer)
+		return -1;
+
+	queue->length = length;
+	queue->stride = stride;
+	reset_shadow_queue(queue);
+	return 0;
+}
+
+void destroy_shadow_queue(struct shadow_queue *queue)
+{
+	if (queue->buffer) {
+		mana_dealloc_mem(queue->buffer, queue->stride * queue->length);
+		queue->buffer = NULL;
+	}
 }
 
 int mana_query_device_ex(struct ibv_context *context,

providers/mana/mana.h

@@ -182,7 +182,8 @@ struct mana_parent_domain {
 
 struct mana_context *to_mctx(struct ibv_context *ibctx);
 
-void *mana_alloc_mem(uint32_t size);
+void *mana_alloc_mem(size_t size);
+void mana_dealloc_mem(void *buf, size_t size);
 
 int mana_query_device_ex(struct ibv_context *context,
 			 const struct ibv_query_device_ex_input *input,

providers/mana/qp.c

@@ -352,7 +352,7 @@ static struct ibv_qp *mana_create_qp_rc(struct ibv_pd *ibpd,
 	mana_ib_deinit_rb_shmem(qp);
 destroy_queues:
 	while (i-- > 0)
-		munmap(qp->rc_qp.queues[i].buffer, qp->rc_qp.queues[i].size);
+		mana_dealloc_mem(qp->rc_qp.queues[i].buffer, qp->rc_qp.queues[i].size);
 	destroy_shadow_queue(&qp->shadow_rq);
 destroy_shadow_sq:
 	destroy_shadow_queue(&qp->shadow_sq);
@@ -482,7 +482,7 @@ int mana_destroy_qp(struct ibv_qp *ibqp)
 		destroy_shadow_queue(&qp->shadow_rq);
 		mana_ib_deinit_rb_shmem(qp);
 		for (i = 0; i < USER_RC_QUEUE_TYPE_MAX; ++i)
-			munmap(qp->rc_qp.queues[i].buffer, qp->rc_qp.queues[i].size);
+			mana_dealloc_mem(qp->rc_qp.queues[i].buffer, qp->rc_qp.queues[i].size);
 		break;
 	default:
 		verbs_err(verbs_get_ctx(ibqp->context),

providers/mana/shadow_queue.h

@@ -60,31 +60,9 @@ static inline void reset_shadow_queue(struct shadow_queue *queue)
 	queue->next_to_signal_idx = 0;
 }
 
-static inline int create_shadow_queue(struct shadow_queue *queue, uint32_t length, uint32_t stride)
-{
-	length = roundup_pow_of_two(length);
-	stride = align(stride, 8);
-
-	void *buffer = mmap(NULL, stride * length, PROT_READ | PROT_WRITE,
-			MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-
-	if (buffer == MAP_FAILED)
-		return -1;
-
-	queue->length = length;
-	queue->stride = stride;
-	reset_shadow_queue(queue);
-	queue->buffer = buffer;
-	return 0;
-}
+int create_shadow_queue(struct shadow_queue *queue, uint32_t length, uint32_t stride);
 
-static inline void destroy_shadow_queue(struct shadow_queue *queue)
-{
-	if (queue->buffer) {
-		munmap(queue->buffer, queue->stride * queue->length);
-		queue->buffer = NULL;
-	}
-}
+void destroy_shadow_queue(struct shadow_queue *queue);
 
 static inline _atomic_t *producer(struct shadow_queue *queue)
 {