[Accel-config] [PATCH v1 8/9] accel-config/test: split drain multi task from noop multi task

Noop operation is different from drain, so add drain functions to set
the test flags.

Signed-off-by: Tony Zhu <tony.zhu(a)intel.com>
---
 test/dsa.c      | 44 ++++++++++++++++++++++++++++++++++++++++++++
 test/dsa.h      |  4 ++++
 test/dsa_test.c | 20 +++++++++++++++++---
 test/prep.c     | 10 ++++++++++
 4 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/test/dsa.c b/test/dsa.c
index eead318..ecda9a3 100644
--- a/test/dsa.c
+++ b/test/dsa.c
@@ -920,6 +920,50 @@ int dsa_noop_multi_task_nodes(struct dsa_context *ctx)
 	return ret;
 }
 
+int dsa_wait_drain(struct dsa_context *ctx, struct task *tsk)
+{
+	struct dsa_completion_record *comp = tsk->comp;
+	int rc;
+
+	rc = dsa_wait_on_desc_timeout(comp, ms_timeout);
+	if (rc < 0) {
+		err("drain desc timeout\n");
+		return DSA_STATUS_TIMEOUT;
+	}
+
+	return DSA_STATUS_OK;
+}
+
+int dsa_drain_multi_task_nodes(struct dsa_context *ctx)
+{
+	struct task_node *tsk_node = ctx->multi_task_node;
+	int ret = DSA_STATUS_OK;
+
+	while (tsk_node) {
+		tsk_node->tsk->dflags = IDXD_OP_FLAG_CRAV | IDXD_OP_FLAG_RCR;
+
+		dsa_prep_drain(tsk_node->tsk);
+		tsk_node = tsk_node->next;
+	}
+
+	tsk_node = ctx->multi_task_node;
+	while (tsk_node) {
+		dsa_desc_submit(ctx, tsk_node->tsk->desc);
+		tsk_node = tsk_node->next;
+	}
+	tsk_node = ctx->multi_task_node;
+	info("Submitted all drain jobs\n");
+
+	while (tsk_node) {
+		ret = dsa_wait_drain(ctx, tsk_node->tsk);
+		if (ret != DSA_STATUS_OK)
+			info("Desc: %p failed with ret: %d\n",
+			     tsk_node->tsk->desc, tsk_node->tsk->comp->status);
+		tsk_node = tsk_node->next;
+	}
+	return ret;
+}
+
 int dsa_wait_batch(struct batch_task *btsk)
 {
 	int rc;
diff --git a/test/dsa.h b/test/dsa.h
index 007883e..6cceb62 100644
--- a/test/dsa.h
+++ b/test/dsa.h
@@ -265,6 +265,9 @@ int init_task(struct task *tsk, int tflags, int opcode,
 int dsa_noop_multi_task_nodes(struct dsa_context *ctx);
 int dsa_wait_noop(struct dsa_context *ctx, struct task *tsk);
 
+int dsa_drain_multi_task_nodes(struct dsa_context *ctx);
+int dsa_wait_drain(struct dsa_context *ctx, struct task *tsk);
+
 int dsa_memcpy_multi_task_nodes(struct dsa_context *ctx);
 int dsa_wait_memcpy(struct dsa_context *ctx, struct task *tsk);
 
@@ -299,6 +302,7 @@ int dsa_dif_updt_multi_task_nodes(struct dsa_context *ctx);
 int dsa_wait_dif(struct dsa_context *ctx, struct task *tsk);
 
 void dsa_prep_noop(struct task *tsk);
+void dsa_prep_drain(struct task *tsk);
 void dsa_prep_memcpy(struct task *tsk);
 void dsa_reprep_memcpy(struct dsa_context *ctx, struct task *tsk);
 void dsa_prep_memfill(struct task *tsk);
diff --git a/test/dsa_test.c b/test/dsa_test.c
index 13558ec..9b56160 100644
--- a/test/dsa_test.c
+++ b/test/dsa_test.c
@@ -237,9 +237,23 @@ static int test_noop_drain(struct dsa_context *ctx, int tflags, uint32_t opcode,
 			tsk_node = tsk_node->next;
 		}
 
-		rc = dsa_noop_multi_task_nodes(ctx);
-		if (rc != DSA_STATUS_OK)
-			return rc;
+		switch (opcode) {
+		case DSA_OPCODE_NOOP:
+			rc = dsa_noop_multi_task_nodes(ctx);
+			if (rc != DSA_STATUS_OK)
+				return rc;
+			break;
+
+		case DSA_OPCODE_DRAIN:
+			rc = dsa_drain_multi_task_nodes(ctx);
+			if (rc != DSA_STATUS_OK)
+				return rc;
+			break;
+
+		default:
+			err("Unsupported op %#x\n", opcode);
+			return -EINVAL;
+		}
 
 		/* Verification of all the nodes*/
 		tsk_node = ctx->multi_task_node;
diff --git a/test/prep.c b/test/prep.c
index 56c821d..48e0a7e 100644
--- a/test/prep.c
+++ b/test/prep.c
@@ -43,6 +43,16 @@ void dsa_prep_noop(struct task *tsk)
 	tsk->comp->status = 0;
 }
 
+void dsa_prep_drain(struct task *tsk)
+{
+	info("preparing descriptor for noop\n");
+
+	dsa_prep_desc_common(tsk->desc, tsk->opcode, (uint64_t)(tsk->dst1),
+			     (uint64_t)(tsk->src1), 0, 0xc);
+	tsk->desc->completion_addr = (uint64_t)(tsk->comp);
+	tsk->comp->status = 0;
+}
+
 void dsa_prep_memcpy(struct task *tsk)
 {
 	info("preparing descriptor for memcpy\n");
-- 
2.27.0