DPDK patches and discussions
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@redhat.com>
To: Elena Agostini <eagostini@nvidia.com>
Cc: dev <dev@dpdk.org>
Subject: Re: [PATCH v1] app/test-gpudev: improve tests' output
Date: Wed, 17 Nov 2021 08:50:07 +0100	[thread overview]
Message-ID: <CAJFAV8xE0T1Q1o3k97jVj04Wx+Sfr7P9Pko+HNJER6FtKpMkuw@mail.gmail.com> (raw)
In-Reply-To: <20211115230328.20618-1-eagostini@nvidia.com>

On Mon, Nov 15, 2021 at 3:53 PM <eagostini@nvidia.com> wrote:
>
> From: Elena Agostini <eagostini@nvidia.com>
>
> Signed-off-by: Elena Agostini <eagostini@nvidia.com>
> ---
>  app/test-gpudev/main.c | 90 ++++++++++++++++++++++++++----------------
>  1 file changed, 55 insertions(+), 35 deletions(-)
>
> diff --git a/app/test-gpudev/main.c b/app/test-gpudev/main.c
> index 1db3f69e10..e42133b3aa 100644
> --- a/app/test-gpudev/main.c
> +++ b/app/test-gpudev/main.c
> @@ -70,46 +70,51 @@ alloc_gpu_memory(uint16_t gpu_id)
>         size_t buf_bytes = 1024;
>         int ret;
>
> -       printf("\n=======> TEST: Allocate GPU memory\n");
> +       printf("\n=======> TEST: Allocate GPU memory\n\n");
>
>         /* Alloc memory on GPU 0 */
>         ptr_1 = rte_gpu_mem_alloc(gpu_id, buf_bytes);
>         if (ptr_1 == NULL) {
>                 fprintf(stderr, "rte_gpu_mem_alloc GPU memory returned error\n");
> -               return -1;
> +               goto error;
>         }
> -       printf("GPU memory allocated at 0x%p %zdB\n", ptr_1, buf_bytes);
> +       printf("GPU memory allocated at 0x%p size is %zd bytes\n", ptr_1, buf_bytes);
>
>         ptr_2 = rte_gpu_mem_alloc(gpu_id, buf_bytes);
>         if (ptr_2 == NULL) {
>                 fprintf(stderr, "rte_gpu_mem_alloc GPU memory returned error\n");
> -               return -1;
> +               goto error;
>         }
> -       printf("GPU memory allocated at 0x%p %zdB\n", ptr_2, buf_bytes);
> +       printf("GPU memory allocated at 0x%p size is %zd bytes\n", ptr_2, buf_bytes);
>
>         ret = rte_gpu_mem_free(gpu_id, (uint8_t *)(ptr_1)+0x700);
>         if (ret < 0) {
> -               printf("GPU memory 0x%p + 0x700 NOT freed because of memory address not recognized by driver\n", ptr_1);
> +               printf("GPU memory 0x%p NOT freed: gpu driver didn't find this memory address internally.\n", (uint8_t *)(ptr_1)+0x700);
>         } else {
> -               fprintf(stderr, "rte_gpu_mem_free erroneously freed GPU memory 0x%p + 0x700\n", ptr_1);
> -               return -1;
> +               fprintf(stderr, "ERROR: rte_gpu_mem_free freed GPU memory 0x%p\n", (uint8_t *)(ptr_1)+0x700);
> +               goto error;
>         }
>
>         ret = rte_gpu_mem_free(gpu_id, ptr_2);
>         if (ret < 0) {
>                 fprintf(stderr, "rte_gpu_mem_free returned error %d\n", ret);
> -               return -1;
> +               goto error;
>         }
>         printf("GPU memory 0x%p freed\n", ptr_2);
>
>         ret = rte_gpu_mem_free(gpu_id, ptr_1);
>         if (ret < 0) {
>                 fprintf(stderr, "rte_gpu_mem_free returned error %d\n", ret);
> -               return -1;
> +               goto error;
>         }
>         printf("GPU memory 0x%p freed\n", ptr_1);
>
> +       printf("\n=======> TEST: PASSED\n");
>         return 0;
> +
> +error:

It was already the case before the patch, but this code leaks gpu
memory on error.
Other places in this file show the same type of leaks.
Please fix.


> +       printf("\n=======> TEST: FAILED\n");
> +       return -1;
>  }
>
>  static int


-- 
David Marchand


> +       printf("\n=======> TEST: FAILED\n");
> +       return -1;
>  }
>
>  static int
> @@ -162,25 +171,25 @@ create_update_comm_flag(uint16_t gpu_id)
>         uint32_t set_val;
>         uint32_t get_val;
>
> -       printf("\n=======> TEST: Communication flag\n");
> +       printf("\n=======> TEST: Communication flag\n\n");
>
>         ret = rte_gpu_comm_create_flag(gpu_id, &devflag, RTE_GPU_COMM_FLAG_CPU);
>         if (ret < 0) {
>                 fprintf(stderr, "rte_gpu_comm_create_flag returned error %d\n", ret);
> -               return -1;
> +               goto error;
>         }
>
>         set_val = 25;
>         ret = rte_gpu_comm_set_flag(&devflag, set_val);
>         if (ret < 0) {
>                 fprintf(stderr, "rte_gpu_comm_set_flag returned error %d\n", ret);
> -               return -1;
> +               goto error;
>         }
>
>         ret = rte_gpu_comm_get_flag_value(&devflag, &get_val);
>         if (ret < 0) {
>                 fprintf(stderr, "rte_gpu_comm_get_flag_value returned error %d\n", ret);
> -               return -1;
> +               goto error;
>         }
>
>         printf("Communication flag value at 0x%p was set to %d and current value is %d\n", devflag.ptr, set_val, get_val);
> @@ -189,13 +198,13 @@ create_update_comm_flag(uint16_t gpu_id)
>         ret = rte_gpu_comm_set_flag(&devflag, set_val);
>         if (ret < 0) {
>                 fprintf(stderr, "rte_gpu_comm_set_flag returned error %d\n", ret);
> -               return -1;
> +               goto error;
>         }
>
>         ret = rte_gpu_comm_get_flag_value(&devflag, &get_val);
>         if (ret < 0) {
>                 fprintf(stderr, "rte_gpu_comm_get_flag_value returned error %d\n", ret);
> -               return -1;
> +               goto error;
>         }
>
>         printf("Communication flag value at 0x%p was set to %d and current value is %d\n", devflag.ptr, set_val, get_val);
> @@ -203,10 +212,15 @@ create_update_comm_flag(uint16_t gpu_id)
>         ret = rte_gpu_comm_destroy_flag(&devflag);
>         if (ret < 0) {
>                 fprintf(stderr, "rte_gpu_comm_destroy_flags returned error %d\n", ret);
> -               return -1;
> +               goto error;
>         }
>
> +       printf("\n=======> TEST: PASSED\n");
>         return 0;
> +
> +error:
> +       printf("\n=======> TEST: FAILED\n");
> +       return -1;
>  }
>
>  static int
> @@ -236,12 +250,12 @@ create_update_comm_list(uint16_t gpu_id)
>         uint32_t num_comm_items = 1024;
>         struct rte_mbuf *mbufs[10];
>
> -       printf("\n=======> TEST: Communication list\n");
> +       printf("\n=======> TEST: Communication list\n\n");
>
>         comm_list = rte_gpu_comm_create_list(gpu_id, num_comm_items);
>         if (comm_list == NULL) {
>                 fprintf(stderr, "rte_gpu_comm_create_list returned error %d\n", ret);
> -               return -1;
> +               goto error;
>         }
>
>         /**
> @@ -251,7 +265,7 @@ create_update_comm_list(uint16_t gpu_id)
>                 mbufs[i] = rte_zmalloc(NULL, sizeof(struct rte_mbuf), 0);
>                 if (mbufs[i] == NULL) {
>                         fprintf(stderr, "Failed to allocate fake mbufs in CPU memory.\n");
> -                       return -1;
> +                       goto error;
>                 }
>
>                 memset(mbufs[i], 0, sizeof(struct rte_mbuf));
> @@ -263,20 +277,21 @@ create_update_comm_list(uint16_t gpu_id)
>         ret = rte_gpu_comm_populate_list_pkts(&(comm_list[0]), mbufs, 10);
>         if (ret < 0) {
>                 fprintf(stderr, "rte_gpu_comm_populate_list_pkts returned error %d\n", ret);
> -               return -1;
> +               goto error;
>         }
>
>         ret = rte_gpu_comm_cleanup_list(&(comm_list[0]));
>         if (ret == 0) {
>                 fprintf(stderr, "rte_gpu_comm_cleanup_list erroneously cleaned the list even if packets have not been consumed yet\n");
> -               return -1;
> +               goto error;
>         }
> -       fprintf(stderr, "rte_gpu_comm_cleanup_list correctly didn't clean up the packets because they have not been consumed yet\n");
> +       printf("Communication list not cleaned because packets have not been consumed yet.\n");
>
>         /**
>          * Simulate a GPU tasks going through the packet list to consume
>          * mbufs packets and release them
>          */
> +       printf("Consuming packets...\n");
>         simulate_gpu_task(&(comm_list[0]), 10);
>
>         /**
> @@ -286,20 +301,26 @@ create_update_comm_list(uint16_t gpu_id)
>         ret = rte_gpu_comm_cleanup_list(&(comm_list[0]));
>         if (ret < 0) {
>                 fprintf(stderr, "rte_gpu_comm_cleanup_list returned error %d\n", ret);
> -               return -1;
> +               goto error;
>         }
>
> +       printf("Communication list cleaned because packets have been consumed now.\n");
> +
>         ret = rte_gpu_comm_destroy_list(comm_list, num_comm_items);
>         if (ret < 0) {
>                 fprintf(stderr, "rte_gpu_comm_destroy_list returned error %d\n", ret);
> -               return -1;
> +               goto error;
>         }
>
>         for (i = 0; i < 10; i++)
>                 rte_free(mbufs[i]);
>
> -       printf("\nCommunication list test passed!\n");
> +       printf("\n=======> TEST: PASSED\n");
>         return 0;
> +
> +error:
> +       printf("\n=======> TEST: FAILED\n");
> +       return -1;
>  }
>
>  int
> @@ -360,7 +381,6 @@ main(int argc, char **argv)
>
>         /* clean up the EAL */
>         rte_eal_cleanup();
> -       printf("Bye...\n");
>
>         return EXIT_SUCCESS;
>  }
> --
> 2.17.1
>


      parent reply	other threads:[~2021-11-17  7:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-15 23:03 eagostini
2021-11-16 20:05 ` Thomas Monjalon
2021-11-17  7:50 ` David Marchand [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAJFAV8xE0T1Q1o3k97jVj04Wx+Sfr7P9Pko+HNJER6FtKpMkuw@mail.gmail.com \
    --to=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=eagostini@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).