From: Fei Li <shirley17fei@gmail.com>
To: qemu-devel@nongnu.org, shirley17fei@gmail.com
Cc: Markus Armbruster <armbru@redhat.com>,
Peter Xu <peterx@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
Fei Li <fli@suse.com>, Gerd Hoffmann <kraxel@redhat.com>,
David Gibson <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PATCH v14 11/11] qemu_thread: supplement error handling for touch_all_pages
Date: Wed, 17 Jul 2019 10:33:10 +0800 [thread overview]
Message-ID: <20190717023310.197246-12-shirley17fei@gmail.com> (raw)
In-Reply-To: <20190717023310.197246-1-shirley17fei@gmail.com>
From: Fei Li <fli@suse.com>
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 <armbru@redhat.com>
Signed-off-by: Fei Li <fli@suse.com>
---
util/oslib-posix.c | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 55c1b9c098..eff5af3ccf 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -448,12 +448,12 @@ 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;
char *addr = area;
- int i = 0;
+ int i = 0, j = 0;
memset_thread_failed = false;
memset_num_threads = get_memset_num_threads(smp_cpus);
@@ -465,20 +465,32 @@ 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) {
+ break;
+ }
addr += size_per_thread;
numpages -= numpages_per_thread;
}
- for (i = 0; i < memset_num_threads; i++) {
- qemu_thread_join(&memset_thread[i].pgthread);
+
+ for (j = 0; j < i; j++) {
+ qemu_thread_join(&memset_thread[j].pgthread);
}
g_free(memset_thread);
memset_thread = NULL;
- return memset_thread_failed;
+ if (i < memset_num_threads) {
+ /* qemu_thread_create() has set @errp */
+ return false;
+ }
+
+ if (memset_thread_failed) {
+ error_setg(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,
@@ -501,10 +513,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) {
--
2.11.0
prev parent reply other threads:[~2019-07-17 2:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 2:32 [Qemu-devel] [PATCH v14 00/11] qemu_thread_create: propagate the error to callers to handle Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 01/11] qemu_thread: make qemu_thread_create() take Error ** argument Fei Li
2019-07-17 5:53 ` David Gibson
2019-07-17 12:27 ` Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 02/11] qemu_thread: supplement error handling for qemu_X_start_vcpu Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 03/11] qemu_thread: supplement error handling for qmp_dump_guest_memory Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 04/11] qemu_thread: supplement error handling for pci_edu_realize Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 05/11] qemu_thread: supplement error handling for h_resize_hpt_prepare Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 06/11] qemu_thread: supplement error handling for emulated_realize Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 07/11] qemu_thread: supplement error handling for iothread_complete Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 08/11] qemu_thread: supplement error handling for qemu_signalfd_compat Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 09/11] qemu_thread: supplement error handling for migration Fei Li
2019-07-17 2:33 ` [Qemu-devel] [PATCH v14 10/11] qemu_thread: supplement error handling for vnc_start_worker_thread Fei Li
2019-07-17 2:33 ` Fei Li [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=20190717023310.197246-12-shirley17fei@gmail.com \
--to=shirley17fei@gmail.com \
--cc=armbru@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=dgilbert@redhat.com \
--cc=fli@suse.com \
--cc=kraxel@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).