From patchwork Thu Jan 20 12:34:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Bharadwaj X-Patchwork-Id: 79677 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 468B7B70D5 for ; Thu, 20 Jan 2011 23:40:16 +1100 (EST) Received: from localhost ([127.0.0.1]:52018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pfto2-0004Nr-CS for incoming@patchwork.ozlabs.org; Thu, 20 Jan 2011 07:40:02 -0500 Received: from [140.186.70.92] (port=37253 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PftiM-0001Yd-KF for qemu-devel@nongnu.org; Thu, 20 Jan 2011 07:34:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PftiL-0002ir-80 for qemu-devel@nongnu.org; Thu, 20 Jan 2011 07:34:10 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:56096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PftiK-0002id-8c for qemu-devel@nongnu.org; Thu, 20 Jan 2011 07:34:09 -0500 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by e28smtp03.in.ibm.com (8.14.4/8.13.1) with ESMTP id p0KCY2Oj022562 for ; Thu, 20 Jan 2011 18:04:02 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p0KCY2cv3788910 for ; Thu, 20 Jan 2011 18:04:02 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p0KCY1UP012246 for ; Thu, 20 Jan 2011 23:34:01 +1100 Received: from localhost6.localdomain6 (Crystal-Planet.in.ibm.com [9.124.35.20]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p0KCY1oT012240; Thu, 20 Jan 2011 23:34:01 +1100 To: qemu-devel@nongnu.org From: Arun R Bharadwaj Date: Thu, 20 Jan 2011 18:04:01 +0530 Message-ID: <20110120123401.17667.24425.stgit@localhost6.localdomain6> In-Reply-To: <20110120123236.17667.66688.stgit@localhost6.localdomain6> References: <20110120123236.17667.66688.stgit@localhost6.localdomain6> User-Agent: StGit/0.15 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: kwolf@redhat.com, aliguori@linux.vnet.ibm.com, jvrao@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 08/12] Threadlet: Add aio_signal_handler threadlet API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds aio_signal_handler threadlet API. Earler posix-aio-compat.c had its own signal handler code. Now abstract this, in the later patch it is moved to a generic code so that it can be used by other subsystems. Signed-off-by: Arun R Bharadwaj Reviewed-by: Stefan Hajnoczi --- Makefile.objs | 1 + posix-aio-compat.c | 30 ++++++++---------------------- qemu-threadlet.c | 39 +++++++++++++++++++++++++++++++++++++++ qemu-threadlet.h | 19 +++++++++++++++++++ vl.c | 3 +++ 5 files changed, 70 insertions(+), 22 deletions(-) create mode 100644 qemu-threadlet.c create mode 100644 qemu-threadlet.h diff --git a/Makefile.objs b/Makefile.objs index 3b7ec27..3b11dd0 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -10,6 +10,7 @@ qobject-obj-y += qerror.o block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o block-obj-y += nbd.o block.o aio.o aes.o osdep.o qemu-config.o block-obj-$(CONFIG_POSIX) += qemu-thread.o +block-obj-$(CONFIG_POSIX) += qemu-threadlet.o block-obj-$(CONFIG_POSIX) += posix-aio-compat.o block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o diff --git a/posix-aio-compat.c b/posix-aio-compat.c index a7625d8..96e28db 100644 --- a/posix-aio-compat.c +++ b/posix-aio-compat.c @@ -327,11 +327,14 @@ static void *threadlet_worker(void *data) return NULL; } +static PosixAioState *posix_aio_state; + static void handle_work(ThreadletWork *work) { pid_t pid; ssize_t ret = 0; struct qemu_paiocb *aiocb; + char byte = 0; pid = getpid(); aiocb = container_of(work, struct qemu_paiocb, work); @@ -358,6 +361,11 @@ static void handle_work(ThreadletWork *work) qemu_cond_broadcast(&aiocb_completion); qemu_mutex_unlock(&aiocb_mutex); + ret = write(posix_aio_state->wfd, &byte, sizeof(byte)); + if (ret < 0 && errno != EAGAIN) { + die("write()"); + } + if (kill(pid, aiocb->ev_signo)) { die("kill failed"); } @@ -518,22 +526,6 @@ static int posix_aio_flush(void *opaque) return !!s->first_aio; } -static PosixAioState *posix_aio_state; - -static void aio_signal_handler(int signum) -{ - if (posix_aio_state) { - char byte = 0; - ssize_t ret; - - ret = write(posix_aio_state->wfd, &byte, sizeof(byte)); - if (ret < 0 && errno != EAGAIN) - die("write()"); - } - - qemu_service_io(); -} - static void paio_remove(struct qemu_paiocb *acb) { struct qemu_paiocb **pacb; @@ -652,7 +644,6 @@ BlockDriverAIOCB *paio_ioctl(BlockDriverState *bs, int fd, int paio_init(void) { - struct sigaction act; PosixAioState *s; int fds[2]; @@ -664,11 +655,6 @@ int paio_init(void) s = qemu_malloc(sizeof(PosixAioState)); - sigfillset(&act.sa_mask); - act.sa_flags = 0; /* do not restart syscalls to interrupt select() */ - act.sa_handler = aio_signal_handler; - sigaction(SIGUSR2, &act, NULL); - s->first_aio = NULL; if (qemu_pipe(fds) == -1) { fprintf(stderr, "failed to create pipe\n"); diff --git a/qemu-threadlet.c b/qemu-threadlet.c new file mode 100644 index 0000000..857d08d --- /dev/null +++ b/qemu-threadlet.c @@ -0,0 +1,39 @@ +/* + * Threadlet support for offloading tasks to be executed asynchronously + * + * Copyright IBM, Corp. 2008 + * Copyright IBM, Corp. 2010 + * + * Authors: + * Anthony Liguori + * Aneesh Kumar K.V + * Gautham R Shenoy + * Arun R Bharadwaj + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + */ + +#include + +#include "qemu-threadlet.h" +#include "osdep.h" + +static void threadlet_io_completion_signal_handler(int signum) +{ + qemu_service_io(); +} + +static void threadlet_register_signal_handler(void) +{ + struct sigaction act; + sigfillset(&act.sa_mask); + act.sa_flags = 0; /* do not restart syscalls to interrupt select() */ + act.sa_handler = threadlet_io_completion_signal_handler; + sigaction(SIGUSR2, &act, NULL); +} + +void threadlet_init(void) +{ + threadlet_register_signal_handler(); +} diff --git a/qemu-threadlet.h b/qemu-threadlet.h new file mode 100644 index 0000000..2c225d6 --- /dev/null +++ b/qemu-threadlet.h @@ -0,0 +1,19 @@ +/* + * Threadlet support for offloading tasks to be executed asynchronously + * + * Copyright IBM, Corp. 2008 + * Copyright IBM, Corp. 2010 + * + * Authors: + * Anthony Liguori + * Aneesh Kumar K.V + * Gautham R Shenoy + * Arun R Bharadwaj + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + */ + +#include "qemu-common.h" + +void threadlet_init(void); diff --git a/vl.c b/vl.c index df414ef..d04fc7a 100644 --- a/vl.c +++ b/vl.c @@ -148,6 +148,7 @@ int main(int argc, char **argv) #include "qemu-config.h" #include "qemu-objects.h" #include "qemu-options.h" +#include "qemu-threadlet.h" #ifdef CONFIG_VIRTFS #include "fsdev/qemu-fsdev.h" #endif @@ -2922,6 +2923,8 @@ int main(int argc, char **argv, char **envp) exit(1); } + threadlet_init(); + /* init generic devices */ if (qemu_opts_foreach(qemu_find_opts("device"), device_init_func, NULL, 1) != 0) exit(1);