diff mbox series

[1/2] app/mldev: fix build with debug

Message ID 20230320102624.1258816-1-david.marchand@redhat.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series [1/2] app/mldev: fix build with debug |

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

David Marchand March 20, 2023, 10:26 a.m. UTC 
  Compiling with -O0 and -g triggers these warnings:

../app/test-mldev/test_inference_common.c: In function
	‘ml_request_finish’:
../app/test-mldev/test_inference_common.c:946:51:
	error: ‘.q.’ directive output may be truncated writing 3 bytes
	into a region of size between 0 and 4095
	[-Werror=format-truncation=]
  946 |                 snprintf(str, sizeof(str) - 1, "%s.q.%d",
      |                                                   ^~~
	t->cmn.opt->filelist[req->fid].output, obj_idx);
../app/test-mldev/test_inference_common.c:946:48: note: using the range
	[-2147483648, 2147483647] for directive argument
  946 |                 snprintf(str, sizeof(str) - 1, "%s.q.%d",
      |                                                ^~~~~~~~~
	t->cmn.opt->filelist[req->fid].output, obj_idx);
../app/test-mldev/test_inference_common.c:946:17: note: ‘snprintf’
	output between 5 and 4110 bytes into a destination of size 4095
  946 |                 snprintf(str, sizeof(str) - 1, "%s.q.%d",
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	t->cmn.opt->filelist[req->fid].output, obj_idx);
../app/test-mldev/test_inference_common.c:952:51: error: ‘.’ directive
	output may be truncated writing 1 byte into a region of size
	between 0 and 4095 [-Werror=format-truncation=]
  952 |                 snprintf(str, sizeof(str) - 1, "%s.%d",
      |                                                   ^
	t->cmn.opt->filelist[req->fid].output, obj_idx);
../app/test-mldev/test_inference_common.c:952:48: note: using the range
	[-2147483648, 2147483647] for directive argument
  952 |                 snprintf(str, sizeof(str) - 1, "%s.%d",
      |                                                ^~~~~~~
	t->cmn.opt->filelist[req->fid].output, obj_idx);
../app/test-mldev/test_inference_common.c:952:17: note: ‘snprintf’
	output between 3 and 4108 bytes into a destination of size 4095
  952 |                 snprintf(str, sizeof(str) - 1, "%s.%d",
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	t->cmn.opt->filelist[req->fid].output, obj_idx);
../app/test-mldev/test_inference_common.c:929:51: error: ‘.q’ directive
	output may be truncated writing 2 bytes into a region of size
	between 0 and 4095 [-Werror=format-truncation=]
  929 |                 snprintf(str, sizeof(str) - 1, "%s.q",
      |                                                   ^~
	t->cmn.opt->filelist[req->fid].output);
../app/test-mldev/test_inference_common.c:929:17: note: ‘snprintf’
	output between 3 and 4098 bytes into a destination of size 4095
  929 |                 snprintf(str, sizeof(str) - 1, "%s.q",
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	t->cmn.opt->filelist[req->fid].output);
../app/test-mldev/test_inference_common.c:935:51: error: ‘snprintf’
	output may be truncated before the last format character
	[-Werror=format-truncation=]
  935 |                 snprintf(str, sizeof(str) - 1, "%s",
      |                                                   ^
	t->cmn.opt->filelist[req->fid].output);
../app/test-mldev/test_inference_common.c:935:17: note: ‘snprintf’
	output between 1 and 4096 bytes into a destination of size 4095
  935 |                 snprintf(str, sizeof(str) - 1, "%s",
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	t->cmn.opt->filelist[req->fid].output);

Fix unsigned integer format, and switch to dynamic allocations.

Fixes: da6793390596 ("app/mldev: support inference validation")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 app/test-mldev/test_inference_common.c | 29 ++++++++++++++++++--------
 1 file changed, 20 insertions(+), 9 deletions(-)

Comments

David Marchand March 20, 2023, 10:40 a.m. UTC | #1 
On Mon, Mar 20, 2023 at 11:26 AM David Marchand
<david.marchand@redhat.com> wrote:
> ../app/test-mldev/test_inference_common.c:952:48: note: using the range
>         [-2147483648, 2147483647] for directive argument
>   952 |                 snprintf(str, sizeof(str) - 1, "%s.%d",
>       |                                                ^~~~~~~
>         t->cmn.opt->filelist[req->fid].output, obj_idx);
> ../app/test-mldev/test_inference_common.c:952:17: note: ‘snprintf’
>         output between 3 and 4108 bytes into a destination of size 4095
>   952 |                 snprintf(str, sizeof(str) - 1, "%s.%d",
>       |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>         t->cmn.opt->filelist[req->fid].output, obj_idx);

[...]

>
> Fix unsigned integer format, and switch to dynamic allocations.
>

[...]

> @@ -943,14 +948,20 @@ ml_request_finish(struct rte_mempool *mp, void *opaque, void *obj, unsigned int
>  dump_output_fail:
>         if (t->cmn.opt->debug) {
>                 /* dump quantized output buffer */
> -               snprintf(str, PATH_MAX, "%s.q.%d", t->cmn.opt->filelist[req->fid].output, obj_idx);
> -               ML_OPEN_WRITE_GET_ERR(str, req->output, model->out_qsize, error);
> +               if (asprintf(&dump_path, "%s.q.%d", t->cmn.opt->filelist[req->fid].output,

Sent the wrong patch... I forgot to add the change (fixing with %u)
when amending the commitlog.


> +                               obj_idx) == -1)
> +                       return;
> +               ML_OPEN_WRITE_GET_ERR(dump_path, req->output, model->out_qsize, error);
> +               free(dump_path);
>                 if (error)
>                         return;
>
Srikanth Yalavarthi March 20, 2023, 11:29 a.m. UTC | #2 
> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: 20 March 2023 16:11
> To: dev@dpdk.org
> Cc: Srikanth Yalavarthi <syalavarthi@marvell.com>; Anup Prabhu
> <aprabhu@marvell.com>
> Subject: [EXT] Re: [PATCH 1/2] app/mldev: fix build with debug
> 
> External Email
> 
> ----------------------------------------------------------------------
> On Mon, Mar 20, 2023 at 11:26 AM David Marchand
> <david.marchand@redhat.com> wrote:
> > ../app/test-mldev/test_inference_common.c:952:48: note: using the range
> >         [-2147483648, 2147483647] for directive argument
> >   952 |                 snprintf(str, sizeof(str) - 1, "%s.%d",
> >       |                                                ^~~~~~~
> >         t->cmn.opt->filelist[req->fid].output, obj_idx);
> > ../app/test-mldev/test_inference_common.c:952:17: note: ‘snprintf’
> >         output between 3 and 4108 bytes into a destination of size 4095
> >   952 |                 snprintf(str, sizeof(str) - 1, "%s.%d",
> >       |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >         t->cmn.opt->filelist[req->fid].output, obj_idx);
> 
> [...]
> 
> >
> > Fix unsigned integer format, and switch to dynamic allocations.
> >
> 
> [...]
> 
> > @@ -943,14 +948,20 @@ ml_request_finish(struct rte_mempool *mp, void
> > *opaque, void *obj, unsigned int
> >  dump_output_fail:
> >         if (t->cmn.opt->debug) {
> >                 /* dump quantized output buffer */
> > -               snprintf(str, PATH_MAX, "%s.q.%d", t->cmn.opt->filelist[req-
> >fid].output, obj_idx);
> > -               ML_OPEN_WRITE_GET_ERR(str, req->output, model->out_qsize,
> error);
> > +               if (asprintf(&dump_path, "%s.q.%d",
> > + t->cmn.opt->filelist[req->fid].output,
> 
> Sent the wrong patch... I forgot to add the change (fixing with %u) when
> amending the commitlog.

Acked with the format specifier changes. %d to be replaced with %u.

Acked-by: Srikanth Yalavarthi <syalavarthi@marvell.com>

> 
> 
> > +                               obj_idx) == -1)
> > +                       return;
> > +               ML_OPEN_WRITE_GET_ERR(dump_path, req->output, model-
> >out_qsize, error);
> > +               free(dump_path);
> >                 if (error)
> >                         return;
> >
> 
> 
> --
> David Marchand
diff mbox series

Patch

diff --git a/app/test-mldev/test_inference_common.c b/app/test-mldev/test_inference_common.c
index e85f32be60..f7ce732d9a 100644
--- a/app/test-mldev/test_inference_common.c
+++ b/app/test-mldev/test_inference_common.c
@@ -3,6 +3,7 @@ 
  */
 
 #include <errno.h>
+#include <stdio.h>
 #include <unistd.h>
 
 #include <rte_common.h>
@@ -901,8 +902,8 @@  ml_request_finish(struct rte_mempool *mp, void *opaque, void *obj, unsigned int
 	struct test_inference *t = ml_test_priv((struct ml_test *)opaque);
 	struct ml_request *req = (struct ml_request *)obj;
 	struct ml_model *model = &t->model[req->fid];
-	char str[PATH_MAX];
 	bool error = false;
+	char *dump_path;
 
 	RTE_SET_USED(mp);
 
@@ -926,14 +927,18 @@  ml_request_finish(struct rte_mempool *mp, void *opaque, void *obj, unsigned int
 dump_output_pass:
 	if (obj_idx == 0) {
 		/* write quantized output */
-		snprintf(str, PATH_MAX, "%s.q", t->cmn.opt->filelist[req->fid].output);
-		ML_OPEN_WRITE_GET_ERR(str, req->output, model->out_qsize, error);
+		if (asprintf(&dump_path, "%s.q", t->cmn.opt->filelist[req->fid].output) == -1)
+			return;
+		ML_OPEN_WRITE_GET_ERR(dump_path, req->output, model->out_qsize, error);
+		free(dump_path);
 		if (error)
 			return;
 
 		/* write dequantized output */
-		snprintf(str, PATH_MAX, "%s", t->cmn.opt->filelist[req->fid].output);
-		ML_OPEN_WRITE_GET_ERR(str, model->output, model->out_dsize, error);
+		if (asprintf(&dump_path, "%s", t->cmn.opt->filelist[req->fid].output) == -1)
+			return;
+		ML_OPEN_WRITE_GET_ERR(dump_path, model->output, model->out_dsize, error);
+		free(dump_path);
 		if (error)
 			return;
 	}
@@ -943,14 +948,20 @@  ml_request_finish(struct rte_mempool *mp, void *opaque, void *obj, unsigned int
 dump_output_fail:
 	if (t->cmn.opt->debug) {
 		/* dump quantized output buffer */
-		snprintf(str, PATH_MAX, "%s.q.%d", t->cmn.opt->filelist[req->fid].output, obj_idx);
-		ML_OPEN_WRITE_GET_ERR(str, req->output, model->out_qsize, error);
+		if (asprintf(&dump_path, "%s.q.%d", t->cmn.opt->filelist[req->fid].output,
+				obj_idx) == -1)
+			return;
+		ML_OPEN_WRITE_GET_ERR(dump_path, req->output, model->out_qsize, error);
+		free(dump_path);
 		if (error)
 			return;
 
 		/* dump dequantized output buffer */
-		snprintf(str, PATH_MAX, "%s.%d", t->cmn.opt->filelist[req->fid].output, obj_idx);
-		ML_OPEN_WRITE_GET_ERR(str, model->output, model->out_dsize, error);
+		if (asprintf(&dump_path, "%s.%d", t->cmn.opt->filelist[req->fid].output,
+				obj_idx) == -1)
+			return;
+		ML_OPEN_WRITE_GET_ERR(dump_path, model->output, model->out_dsize, error);
+		free(dump_path);
 		if (error)
 			return;
 	}