app/regex: add job context

PATCH Applied [email protected] 3 participants 4 messages Oct 22, 2020 – Nov 3, 2020

lore

Share & tools

lore

[email protected]

author

2020-10-22 07:12 UTC #0 lore raw

PATCH 1/1 app/regex: add job context

From: Guy Kaneti <[email protected]>

Store mbuf pointer associated with that job.

Signed-off-by Guy Kaneti <[email protected]>

---
 app/test-regex/main.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

app/test-regex/main.c +16 -4

index e6080b44b..f869d754b 100644
@@ -35,6 +35,10 @@ enum app_args {
 	ARG_NUM_OF_ITERATIONS,
 };
 
+struct job_ctx {
+	struct rte_mbuf *mbuf;
+};
+
 static void
 usage(const char *prog_name)
 {

@@ -266,6 +270,7 @@ run_regex(struct rte_mempool *mbuf_mp, uint32_t nb_jobs,
 	time_t start;
 	time_t end;
 	double time;
+	struct job_ctx *jobs_ctx;
 
 	shinfo.free_cb = extbuf_free_cb;

@@ -275,6 +280,12 @@ run_regex(struct rte_mempool *mbuf_mp, uint32_t nb_jobs,
 		return -ENOMEM;
 	}
 
+	jobs_ctx = rte_malloc(NULL, sizeof(struct job_ctx)*nb_jobs, 0);
+	if (!jobs_ctx) {
+		printf("Error, can't allocate memory for jobs_ctx.\n");
+		return -ENOMEM;
+	}
+
 	/* Allocate the jobs and assign each job with an mbuf. */
 	for (i = 0; i < nb_jobs; i++) {
 		ops[i] = rte_malloc(NULL, sizeof(*ops[0]) + nb_max_matches *

@@ -317,6 +328,7 @@ run_regex(struct rte_mempool *mbuf_mp, uint32_t nb_jobs,
 		long act_job_len = RTE_MIN(job_len, buf_len - pos);
 		rte_pktmbuf_attach_extbuf(ops[i]->mbuf, &buf[pos], 0,
 					  act_job_len, &shinfo);
+		jobs_ctx[i].mbuf = ops[i]->mbuf;
 		ops[i]->mbuf->data_len = job_len;
 		ops[i]->mbuf->pkt_len = act_job_len;
 		ops[i]->user_id = i;

@@ -386,13 +398,13 @@ run_regex(struct rte_mempool *mbuf_mp, uint32_t nb_jobs,
 	}
 end:
 	for (i = 0; i < actual_jobs; i++) {
-		if (ops[i]) {
-			if (ops[i]->mbuf)
-				rte_pktmbuf_free(ops[i]->mbuf);
+		if (ops[i])
 			rte_free(ops[i]);
-		}
+		if (jobs_ctx[i].mbuf)
+			rte_pktmbuf_free(jobs_ctx[i].mbuf);
 	}
 	rte_free(ops);
+	rte_free(jobs_ctx);
 	if (buf)
 		rte_free(buf);
 	return res;

Signature · 1 line

2.28.0

Guy Kaneti

author

2020-10-27 09:20 UTC #1 lore raw

Hi,

Quoted 83 lines

-----Original Message-----
From: [email protected] <[email protected]>
Sent: Thursday, October 22, 2020 10:11 AM
To: [email protected]
Cc: [email protected]; Guy Kaneti <[email protected]>; Smadar Fuks <[email protected]>; Dovrat Zifroni <[email protected]>; [email protected]
Subject: [PATCH v1] app/regex: add job context

From: Guy Kaneti <[email protected]>

Store mbuf pointer associated with that job.

Signed-off-by Guy Kaneti <[email protected]>

---
 app/test-regex/main.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

app/test-regex/main.c index renamed from app/test-regex/main.c +0 -0

e6080b44b..f869d754b 100644

app/test-regex/main.c +11 -0

@@ -35,6 +35,10 @@ enum app_args {
 	ARG_NUM_OF_ITERATIONS,
 };
 
+struct job_ctx {
+	struct rte_mbuf *mbuf;
+};
+
 static void
 usage(const char *prog_name)
 {

@@ -266,6 +270,7 @@ run_regex(struct rte_mempool *mbuf_mp, uint32_t
 nb_jobs,
 	time_t start;
 	time_t end;
 	double time;
+	struct job_ctx *jobs_ctx;
 
 	shinfo.free_cb = extbuf_free_cb;

@@ -275,6 +280,12 @@ run_regex(struct rte_mempool *mbuf_mp, uint32_t
 nb_jobs,
 		return -ENOMEM;
 	}
 
+	jobs_ctx = rte_malloc(NULL, sizeof(struct job_ctx)*nb_jobs, 0);
+	if (!jobs_ctx) {
+		printf("Error, can't allocate memory for jobs_ctx.\n");
+		return -ENOMEM;
+	}
+
 	/* Allocate the jobs and assign each job with an mbuf. */
 	for (i = 0; i < nb_jobs; i++) {

ops[i] = rte_malloc(NULL, sizeof(*ops[0]) +
nb_max_matches * @@ -317,6 +328,7 @@ run_regex(struct rte_mempool *mbuf_mp, uint32_t nb_jobs,

app/test-regex/main.c +5 -4

 		long act_job_len = RTE_MIN(job_len, buf_len - pos);
 		rte_pktmbuf_attach_extbuf(ops[i]->mbuf, &buf[pos], 0,
 					  act_job_len, &shinfo);
+		jobs_ctx[i].mbuf = ops[i]->mbuf;
 		ops[i]->mbuf->data_len = job_len;
 		ops[i]->mbuf->pkt_len = act_job_len;
 		ops[i]->user_id = i;

@@ -386,13 +398,13 @@ run_regex(struct rte_mempool *mbuf_mp,
 uint32_t nb_jobs,
 	}
 end:
 	for (i = 0; i < actual_jobs; i++) {
-		if (ops[i]) {
-			if (ops[i]->mbuf)
-				rte_pktmbuf_free(ops[i]->mbuf);
+		if (ops[i])
 			rte_free(ops[i]);
-		}
+		if (jobs_ctx[i].mbuf)
+			rte_pktmbuf_free(jobs_ctx[i].mbuf);
 	}
 	rte_free(ops);
+	rte_free(jobs_ctx);
 	if (buf)
 		rte_free(buf);

Quoted 3 lines

return res;
--
2.28.0

Kind reminder to all maintainers, please review and ack/comment.

Ori Kam

Acked-by

2020-10-28 07:37 UTC #2 lore raw

Quoted 87 lines

-----Original Message-----
From: Guy Kaneti <[email protected]>
Sent: Tuesday, October 27, 2020 11:20 AM
Subject: RE: [PATCH v1] app/regex: add job context
Hi,
Quoted 80 lines
-----Original Message-----
From: [email protected] <[email protected]>
Sent: Thursday, October 22, 2020 10:11 AM
To: [email protected]
Cc: [email protected]; Guy Kaneti <[email protected]>; Smadar Fuks <[email protected]>; Dovrat Zifroni <[email protected]>; [email protected]
Subject: [PATCH v1] app/regex: add job context
From: Guy Kaneti <[email protected]>
Store mbuf pointer associated with that job.
Signed-off-by Guy Kaneti <[email protected]>
---
 app/test-regex/main.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
app/test-regex/main.c index renamed from app/test-regex/main.c +0 -0
e6080b44b..f869d754b 100644
app/test-regex/main.c +11 -0
@@ -35,6 +35,10 @@ enum app_args {
 	ARG_NUM_OF_ITERATIONS,
 };
 
+struct job_ctx {
+	struct rte_mbuf *mbuf;
+};
+
 static void
 usage(const char *prog_name)
 {
@@ -266,6 +270,7 @@ run_regex(struct rte_mempool *mbuf_mp, uint32_t
 nb_jobs,
 	time_t start;
 	time_t end;
 	double time;
+	struct job_ctx *jobs_ctx;
 
 	shinfo.free_cb = extbuf_free_cb;
@@ -275,6 +280,12 @@ run_regex(struct rte_mempool *mbuf_mp, uint32_t
 nb_jobs,
 		return -ENOMEM;
 	}
 
+	jobs_ctx = rte_malloc(NULL, sizeof(struct job_ctx)*nb_jobs, 0);
+	if (!jobs_ctx) {
+		printf("Error, can't allocate memory for jobs_ctx.\n");
+		return -ENOMEM;
+	}
+
 	/* Allocate the jobs and assign each job with an mbuf. */
 	for (i = 0; i < nb_jobs; i++) {
ops[i] = rte_malloc(NULL, sizeof(*ops[0]) +
nb_max_matches * @@ -317,6 +328,7 @@ run_regex(struct rte_mempool *mbuf_mp, uint32_t nb_jobs,
app/test-regex/main.c +4 -4
 		long act_job_len = RTE_MIN(job_len, buf_len - pos);
 		rte_pktmbuf_attach_extbuf(ops[i]->mbuf, &buf[pos], 0,
 					  act_job_len, &shinfo);
+		jobs_ctx[i].mbuf = ops[i]->mbuf;
 		ops[i]->mbuf->data_len = job_len;
 		ops[i]->mbuf->pkt_len = act_job_len;
 		ops[i]->user_id = i;
@@ -386,13 +398,13 @@ run_regex(struct rte_mempool *mbuf_mp,
 uint32_t nb_jobs,
 	}
 end:
 	for (i = 0; i < actual_jobs; i++) {
-		if (ops[i]) {
-			if (ops[i]->mbuf)
-				rte_pktmbuf_free(ops[i]->mbuf);
+		if (ops[i])
 			rte_free(ops[i]);
-		}
+		if (jobs_ctx[i].mbuf)
+			rte_pktmbuf_free(jobs_ctx[i].mbuf);
 	}
 	rte_free(ops);

Quoted 8 lines

Quoted 6 lines
app/test-regex/main.c +1 -0
+	rte_free(jobs_ctx);
 	if (buf)
 		rte_free(buf);
return res;
--
2.28.0
Kind reminder to all maintainers, please review and ack/comment.

Acked-by Ori Kam <[email protected]>

Best,
Ori

Thomas Monjalon

Applied

2020-11-03 00:48 UTC #3 lore raw

Quoted 9 lines

Quoted 7 lines
Quoted 5 lines
From: Guy Kaneti <[email protected]>
Store mbuf pointer associated with that job.
Signed-off-by Guy Kaneti <[email protected]>
Kind reminder to all maintainers, please review and ack/comment.
Acked-by Ori Kam <[email protected]>

Applied, thanks