From: Anthony Liguori <aliguori@us.ibm.com>
To: Glauber Costa <glommer@redhat.com>
Cc: jan.kiszka@siemens.com, jes@sgi.com, qemu-devel@nongnu.org,
avi@qumranet.com, Glauber Costa <gcosta@redhat.com>,
dmitry.baryshkov@siemens.com
Subject: [Qemu-devel] Re: [PATCH 02/21] introduce QEMUAccel and fill it with interrupt specific driver
Date: Wed, 15 Oct 2008 15:20:09 -0500 [thread overview]
Message-ID: <48F65079.1040607@us.ibm.com> (raw)
In-Reply-To: <1224107718-19128-3-git-send-email-glommer@redhat.com>
Glauber Costa wrote:
> From: Glauber Costa <gcosta@redhat.com>
>
> This patch introduces QEMUAccel, a placeholder for function pointers
> that aims at helping qemu to abstract accelerators such as kqemu and
> kvm (actually, the 'accelerator' name was proposed by avi kivity, since
> he loves referring to kvm that way).
>
> To begin with, the accelerator is given the opportunity to register a
> cpu_interrupt function, to be called after the raw cpu_interrupt.
> This has the side effect of, for the kqemu accelerator, calling kqemu_cpu_interrupt
> everytime, which didn't use to happen. But looking at the code, this seems safe to me.
>
> This patch applies on raw qemu.
>
> Signed-off-by: Glauber Costa <glommer@redhat.com>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@siemens.com>
> ---
> Makefile.target | 2 +-
> accel.c | 17 +++++++++++++++++
> accel.h | 20 ++++++++++++++++++++
> exec.c | 3 +++
> kqemu.c | 9 +++++++++
> vl.c | 17 +++++------------
> 6 files changed, 55 insertions(+), 13 deletions(-)
> create mode 100644 accel.c
> create mode 100644 accel.h
>
> diff --git a/Makefile.target b/Makefile.target
> index e2edf9d..623ecd8 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -188,7 +188,7 @@ all: $(PROGS)
> #########################################################
> # cpu emulator library
> LIBOBJS=exec.o kqemu.o translate-all.o cpu-exec.o\
> - translate.o host-utils.o
> + translate.o host-utils.o accel.o
> ifdef CONFIG_DYNGEN_OP
> exec.o: dyngen-opc.h
> LIBOBJS+=op.o
> diff --git a/accel.c b/accel.c
> new file mode 100644
> index 0000000..d30460d
> --- /dev/null
> +++ b/accel.c
> @@ -0,0 +1,17 @@
> +#include "hw/hw.h"
> +#include "accel.h"
> +
> +QEMUAccel *current_accel;
> +
> +int _accel_nop(void)
> +{
> + return 0;
> +}
> +
> +#define accel_nop ((void *)_accel_nop)
> +
> +/* Accelerator wrapper for the no-accel (raw qemu) case */
> +QEMUAccel noaccel = {
> + .cpu_interrupt = accel_nop,
> +};
> +
> diff --git a/accel.h b/accel.h
> new file mode 100644
> index 0000000..8e5ddc6
> --- /dev/null
> +++ b/accel.h
> @@ -0,0 +1,20 @@
> +#ifndef _ACCEL_H_
> +#define _ACCEL_H_
> +
> +typedef struct QEMUAccel {
> + void (*cpu_interrupt)(CPUState *env);
> +} QEMUAccel;
> +
> +extern QEMUAccel *current_accel;
> +extern QEMUAccel noaccel;
> +
> +static inline void register_qemu_accel(QEMUAccel *accel)
> +{
> + current_accel = accel;
> +}
> +
> +static inline void accel_cpu_interrupt(CPUState *env)
> +{
> + current_accel->cpu_interrupt(env);
> +}
> +#endif
> diff --git a/exec.c b/exec.c
> index 1cad0be..21253cc 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -43,6 +43,8 @@
> #include <qemu.h>
> #endif
>
> +#include "accel.h"
> +
> //#define DEBUG_TB_INVALIDATE
> //#define DEBUG_FLUSH
> //#define DEBUG_TLB
> @@ -1430,6 +1432,7 @@ void cpu_single_step(CPUState *env, int enabled)
> tb_flush(env);
> }
> #endif
> + accel_cpu_interrupt(env);
> }
>
> /* enable or disable low levels log */
> diff --git a/kqemu.c b/kqemu.c
> index 9b52237..87c06cd 100644
> --- a/kqemu.c
> +++ b/kqemu.c
> @@ -50,6 +50,7 @@
> #include <unistd.h>
> #include <fcntl.h>
> #include "kqemu.h"
> +#include "accel.h"
>
> #ifdef _WIN32
> #define KQEMU_DEVICE "\\\\.\\kqemu"
> @@ -150,6 +151,8 @@ static void kqemu_update_cpuid(CPUState *env)
> accelerated code */
> }
>
> +QEMUAccel kqemu_accel;
> +
> int kqemu_start(void)
> {
> struct kqemu_init kinit;
> @@ -232,6 +235,7 @@ int kqemu_start(void)
> }
> nb_pages_to_flush = 0;
> nb_ram_pages_to_update = 0;
> + register_qemu_accel(&kqemu_accel);
>
> qpi_init();
> return 0;
> @@ -243,6 +247,11 @@ void kqemu_init_env(CPUState *env)
> env->kqemu_enabled = kqemu_allowed;
> }
>
> +QEMUAccel kqemu_accel = {
> + .cpu_interrupt = kqemu_cpu_interrupt,
> +};
>
The hook kqemu uses is for CPU_INTERRUPT_EXIT which is basically
intended to allow IO to run. The fact that it's done via cpu_interrupt
is somewhat hackish.
I think a better hook would be something like run_io_handlers. Since
this is called from signal handlers, we have to be clear that this code
needs to be signal safe. This is compared to say a generic
cpu_interrupt hook which doesn't necessarily need to be signal safe.
Regards,
Anthony Liguori
next prev parent reply other threads:[~2008-10-15 20:20 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-15 21:54 [Qemu-devel] [PATCH 0/21] Accelerators: cleaned up version Glauber Costa
2008-10-15 20:16 ` [Qemu-devel] " Anthony Liguori
2008-10-15 21:54 ` [Qemu-devel] [PATCH 01/21] split kqemu_init into two Glauber Costa
2008-10-15 21:54 ` [Qemu-devel] [PATCH 02/21] introduce QEMUAccel and fill it with interrupt specific driver Glauber Costa
2008-10-15 20:20 ` Anthony Liguori [this message]
2008-10-15 20:58 ` [Qemu-devel] " Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 03/21] init env made accel driver Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 04/21] wrap cache flushing functions into accel drivers Glauber Costa
2008-10-15 20:23 ` [Qemu-devel] " Anthony Liguori
2008-10-15 21:02 ` Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 05/21] turn info kqemu into generic info accelerator Glauber Costa
2008-10-15 20:25 ` [Qemu-devel] " Anthony Liguori
2008-10-15 21:23 ` M. Warner Losh
2008-10-15 21:28 ` Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 06/21] separate accelerator part of info profiler Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 07/21] move kqemu externs to kqemu.h Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 08/21] move disabling code to kqemu.c instead of vl.c Glauber Costa
2008-10-15 20:32 ` [Qemu-devel] " Anthony Liguori
2008-10-15 21:02 ` Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 09/21] set_notdirty goes through accel wrapper Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 10/21] wrap modify_page through accel calls Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 11/21] remove kqemu reference from hw/pc.c Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 12/21] build list of available accelerators Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 13/21] provide --accel option Glauber Costa
2008-10-15 20:36 ` [Qemu-devel] " Anthony Liguori
2008-10-15 21:08 ` Glauber Costa
2008-10-16 19:49 ` Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 14/21] add tsc field to cpu definition Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 15/21] shift for masks Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 16/21] add hook to cpu_register_physical_memory Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 17/21] accel_trace_io Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 18/21] get_env accel wrapper Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 19/21] add next_cpu_index Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 20/21] check wether kqemu is enabled in open code Glauber Costa
2008-10-15 21:55 ` [Qemu-devel] [PATCH 21/21] provide an opaque for accelerator in cpu state Glauber Costa
2008-10-16 9:26 ` [Qemu-devel] " Avi Kivity
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=48F65079.1040607@us.ibm.com \
--to=aliguori@us.ibm.com \
--cc=avi@qumranet.com \
--cc=dmitry.baryshkov@siemens.com \
--cc=gcosta@redhat.com \
--cc=glommer@redhat.com \
--cc=jan.kiszka@siemens.com \
--cc=jes@sgi.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).