Re: [Qemu-devel] [PATCH v11 for-4.0 11/11] qemu_thread: supplement error handling for touch_all_pages

[Fei Li]

It seems that this poor patch is left alone. :(
I sent all, but this patch failed to join them, so sorry for that..
Could we just let it be?

Have a nice day, thanks

Fei

在 2019/2/1 下午1:25, Fei Li 写道:
> From: Fei Li <address@hidden>
>
> Supplement the error handling for touch_all_pages: add an Error
> parameter for it to propagate the error to its caller to do the
> handling in case it fails.
>
> Cc: Markus Armbruster <address@hidden>
> Signed-off-by: Fei Li <address@hidden>
> ---
>   util/oslib-posix.c | 26 ++++++++++++++++----------
>   1 file changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/util/oslib-posix.c b/util/oslib-posix.c
> index b6c2ee270d..b4dd3d8970 100644
> --- a/util/oslib-posix.c
> +++ b/util/oslib-posix.c
> @@ -435,7 +435,7 @@ static inline int get_memset_num_threads(int smp_cpus)
>   }
>   
>   static bool touch_all_pages(char *area, size_t hpagesize, size_t numpages,
> -                            int smp_cpus)
> +                            int smp_cpus, Error **errp)
>   {
>       size_t numpages_per_thread;
>       size_t size_per_thread;
> @@ -452,20 +452,29 @@ static bool touch_all_pages(char *area, size_t hpagesize, 
> size_t numpages,
>           memset_thread[i].numpages = (i == (memset_num_threads - 1)) ?
>                                       numpages : numpages_per_thread;
>           memset_thread[i].hpagesize = hpagesize;
> -        /* TODO: let the callers handle the error instead of abort() here */
> -        qemu_thread_create(&memset_thread[i].pgthread, "touch_pages",
> -                           do_touch_pages, &memset_thread[i],
> -                           QEMU_THREAD_JOINABLE, &error_abort);
> +        if (qemu_thread_create(&memset_thread[i].pgthread, "touch_pages",
> +                               do_touch_pages, &memset_thread[i],
> +                               QEMU_THREAD_JOINABLE, errp) < 0) {
> +            memset_thread_failed = true;
> +            break;
> +        }
>           addr += size_per_thread;
>           numpages -= numpages_per_thread;
>       }
> +
> +    memset_num_threads = i;
>       for (i = 0; i < memset_num_threads; i++) {
>           qemu_thread_join(&memset_thread[i].pgthread);
>       }
>       g_free(memset_thread);
>       memset_thread = NULL;
>   
> -    return memset_thread_failed;
> +    if (memset_thread_failed) {
> +        error_append_hint(errp, "os_mem_prealloc: Insufficient free host "
> +                          "memory pages available to allocate guest RAM");
> +        return false;
> +    }
> +    return true;
>   }
>   
>   void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus,
> @@ -488,10 +497,7 @@ void os_mem_prealloc(int fd, char *area, size_t memory, 
> int smp_cpus,
>       }
>   
>       /* touch pages simultaneously */
> -    if (touch_all_pages(area, hpagesize, numpages, smp_cpus)) {
> -        error_setg(errp, "os_mem_prealloc: Insufficient free host memory "
> -            "pages available to allocate guest RAM");
> -    }
> +    touch_all_pages(area, hpagesize, numpages, smp_cpus, errp);
>   
>       ret = sigaction(SIGBUS, &oldact, NULL);
>       if (ret) {