mirror of https://gitee.com/openkylin/qemu.git
posix-aio-compat: fix latency issues
In certain circumstances, posix-aio-compat can incur a lot of latency: - threads are created by vcpu threads, so if vcpu affinity is set, aio threads inherit vcpu affinity. This can cause many aio threads to compete for one cpu. - we can create up to max_threads (64) aio threads in one go; since a pthread_create can take around 30μs, we have up to 2ms of cpu time under a global lock. Fix by: - moving thread creation to the main thread, so we inherit the main thread's affinity instead of the vcpu thread's affinity. - if a thread is currently being created, and we need to create yet another thread, let thread being born create the new thread, reducing the amount of time we spend under the main thread. - drop the local lock while creating a thread (we may still hold the global mutex, though) Note this doesn't eliminate latency completely; scheduler artifacts or lack of host cpu resources can still cause it. We may want pre-allocated threads when this cannot be tolerated. Thanks to Uli Obergfell of Red Hat for his excellent analysis and suggestions. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
e8045d6726
commit
e4ea78ee76
|
@ -30,6 +30,7 @@
|
||||||
|
|
||||||
#include "block/raw-posix-aio.h"
|
#include "block/raw-posix-aio.h"
|
||||||
|
|
||||||
|
static void do_spawn_thread(void);
|
||||||
|
|
||||||
struct qemu_paiocb {
|
struct qemu_paiocb {
|
||||||
BlockDriverAIOCB common;
|
BlockDriverAIOCB common;
|
||||||
|
@ -64,6 +65,9 @@ static pthread_attr_t attr;
|
||||||
static int max_threads = 64;
|
static int max_threads = 64;
|
||||||
static int cur_threads = 0;
|
static int cur_threads = 0;
|
||||||
static int idle_threads = 0;
|
static int idle_threads = 0;
|
||||||
|
static int new_threads = 0; /* backlog of threads we need to create */
|
||||||
|
static int pending_threads = 0; /* threads created but not running yet */
|
||||||
|
static QEMUBH *new_thread_bh;
|
||||||
static QTAILQ_HEAD(, qemu_paiocb) request_list;
|
static QTAILQ_HEAD(, qemu_paiocb) request_list;
|
||||||
|
|
||||||
#ifdef CONFIG_PREADV
|
#ifdef CONFIG_PREADV
|
||||||
|
@ -311,6 +315,11 @@ static void *aio_thread(void *unused)
|
||||||
|
|
||||||
pid = getpid();
|
pid = getpid();
|
||||||
|
|
||||||
|
mutex_lock(&lock);
|
||||||
|
pending_threads--;
|
||||||
|
mutex_unlock(&lock);
|
||||||
|
do_spawn_thread();
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
struct qemu_paiocb *aiocb;
|
struct qemu_paiocb *aiocb;
|
||||||
ssize_t ret = 0;
|
ssize_t ret = 0;
|
||||||
|
@ -381,11 +390,20 @@ static void *aio_thread(void *unused)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void spawn_thread(void)
|
static void do_spawn_thread(void)
|
||||||
{
|
{
|
||||||
sigset_t set, oldset;
|
sigset_t set, oldset;
|
||||||
|
|
||||||
cur_threads++;
|
mutex_lock(&lock);
|
||||||
|
if (!new_threads) {
|
||||||
|
mutex_unlock(&lock);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
new_threads--;
|
||||||
|
pending_threads++;
|
||||||
|
|
||||||
|
mutex_unlock(&lock);
|
||||||
|
|
||||||
/* block all signals */
|
/* block all signals */
|
||||||
if (sigfillset(&set)) die("sigfillset");
|
if (sigfillset(&set)) die("sigfillset");
|
||||||
|
@ -396,6 +414,27 @@ static void spawn_thread(void)
|
||||||
if (sigprocmask(SIG_SETMASK, &oldset, NULL)) die("sigprocmask restore");
|
if (sigprocmask(SIG_SETMASK, &oldset, NULL)) die("sigprocmask restore");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void spawn_thread_bh_fn(void *opaque)
|
||||||
|
{
|
||||||
|
do_spawn_thread();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void spawn_thread(void)
|
||||||
|
{
|
||||||
|
cur_threads++;
|
||||||
|
new_threads++;
|
||||||
|
/* If there are threads being created, they will spawn new workers, so
|
||||||
|
* we don't spend time creating many threads in a loop holding a mutex or
|
||||||
|
* starving the current vcpu.
|
||||||
|
*
|
||||||
|
* If there are no idle threads, ask the main thread to create one, so we
|
||||||
|
* inherit the correct affinity instead of the vcpu affinity.
|
||||||
|
*/
|
||||||
|
if (!pending_threads) {
|
||||||
|
qemu_bh_schedule(new_thread_bh);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void qemu_paio_submit(struct qemu_paiocb *aiocb)
|
static void qemu_paio_submit(struct qemu_paiocb *aiocb)
|
||||||
{
|
{
|
||||||
aiocb->ret = -EINPROGRESS;
|
aiocb->ret = -EINPROGRESS;
|
||||||
|
@ -665,6 +704,7 @@ int paio_init(void)
|
||||||
die2(ret, "pthread_attr_setdetachstate");
|
die2(ret, "pthread_attr_setdetachstate");
|
||||||
|
|
||||||
QTAILQ_INIT(&request_list);
|
QTAILQ_INIT(&request_list);
|
||||||
|
new_thread_bh = qemu_bh_new(spawn_thread_bh_fn, NULL);
|
||||||
|
|
||||||
posix_aio_state = s;
|
posix_aio_state = s;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue