From patchwork Wed Mar 31 19:42:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 49173 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 EC603B7CF3 for ; Thu, 1 Apr 2010 06:45:00 +1100 (EST) Received: from localhost ([127.0.0.1]:42238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nx3qC-0006V0-TT for incoming@patchwork.ozlabs.org; Wed, 31 Mar 2010 15:44:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nx3oC-0006HM-Bj for qemu-devel@nongnu.org; Wed, 31 Mar 2010 15:42:36 -0400 Received: from [140.186.70.92] (port=40567 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nx3oA-0006Gu-Pq for qemu-devel@nongnu.org; Wed, 31 Mar 2010 15:42:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nx3o7-0001uJ-UF for qemu-devel@nongnu.org; Wed, 31 Mar 2010 15:42:34 -0400 Received: from mail-pv0-f173.google.com ([74.125.83.173]:35966) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nx3o7-0001u8-KT for qemu-devel@nongnu.org; Wed, 31 Mar 2010 15:42:31 -0400 Received: by pvc21 with SMTP id 21so43156pvc.4 for ; Wed, 31 Mar 2010 12:42:30 -0700 (PDT) Received: by 10.143.27.16 with SMTP id e16mr1496541wfj.24.1270064550393; Wed, 31 Mar 2010 12:42:30 -0700 (PDT) Received: from squirrel.codemonkey.ws (cpe-70-123-135-151.austin.res.rr.com [70.123.135.151]) by mx.google.com with ESMTPS id 20sm6365973iwn.1.2010.03.31.12.42.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 31 Mar 2010 12:42:29 -0700 (PDT) Message-ID: <4BB3A5A3.7000106@codemonkey.ws> Date: Wed, 31 Mar 2010 14:42:27 -0500 From: Anthony Liguori User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091209 Fedora/3.0-4.fc12 Lightning/1.0pre Thunderbird/3.0 MIME-Version: 1.0 To: Blue Swirl Subject: Re: [Qemu-devel] Re: [PATCH] vhost: fix features ack References: <20100331182031.GA5200@redhat.com> <4BB393CF.1040700@codemonkey.ws> <20100331153805.03ee142e@redhat.com> <20100331190753.GA6914@redhat.com> In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Luiz Capitulino , qemu-devel@nongnu.org, "Michael S. Tsirkin" 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 On 03/31/2010 02:38 PM, Blue Swirl wrote: > On 3/31/10, Michael S. Tsirkin wrote: > >> On Wed, Mar 31, 2010 at 03:38:05PM -0300, Luiz Capitulino wrote: >> > On Wed, 31 Mar 2010 13:26:23 -0500 >> > Anthony Liguori wrote: >> > >> > > On 03/31/2010 01:20 PM, Michael S. Tsirkin wrote: >> > > > From: David L Stevens >> > > > >> > > > vhost driver in qemu didn't ack features, and this happens >> > > > to work because we don't really require any features. However, >> > > > it's better not to rely on this. This patch passes features to >> > > > vhost as guest acks them. >> > > > >> > > > Signed-off-by: David L Stevens >> > > > Signed-off-by: Michael S. Tsirkin >> > > > --- >> > > > >> > > > Anthony, here's a fixup patch to address an issue in vhost >> > > > patches. Incidentially, what's the status of the vhost patchset? >> > > > >> > > >> > > http://repo.or.cz/w/qemu/aliguori-queue.git vhost >> > > >> > > Is what I'm currently testing. With vhost disabled, the following seg >> > > faults: >> > > >> > > qemu-system-x86_64 -hda ~/images/linux.img -net tap -net >> > > nic,model=virtio -enable-kvm >> > > >> > > But not when using TCG. I'm not sure that it's your patches at fault >> > > and I'm attempting to bisect now to figure that out. >> > >> > Probably this is the same segfault I'm getting right now in master, >> > bisect says it's: >> > >> > """ >> > commit ad96090a01d848df67d70c5259ed8aa321fa8716 >> > Author: Blue Swirl >> > Date: Mon Mar 29 19:23:52 2010 +0000 >> > >> > Refactor target specific handling, compile vl.c only once >> > """ >> >> Why are the compile once patches helpful? They seem to introduce >> churn and bugs, they actively make it harder to extend qemu as you can't use >> target-specific code in code that is compiled once, they might have >> performance penalty - and what do we gain? Any given user is unlikely to >> need to build on more than one target, distros have enough computing >> power to build in parallel. >> > As has been explained many times, knowledge about CPU specific > features has no place in devices. Actively removing CPU specifics from > devices is good but preventing new bad code to be committed is better. > > I don't have distro computing powers (unless some distro's compute > center only has two low power machines) and I guess some other > developers don't have either. All developers and patch submitters are > expected to compile all targets. This patch set has decreased the > number of files compiled by about 20%. > BTW, this seems to do it. I'll commit after some testing. Regards, Anthony Liguori From 7c1920d330fcf7ed5b477bc8e22ca4f7e5e2b343 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 31 Mar 2010 14:20:11 -0500 Subject: [PATCH] Fix -enable-kvm commit ad96090a01d848df67d70c5259ed8aa321fa8716 Author: Blue Swirl Date: Mon Mar 29 19:23:52 2010 +0000 Refactor target specific handling, compile vl.c only once Introduced a regression in -enable-kvm because it left CONFIG_KVM in kvm.h while allowing compiled-once objects to use kvm.h. CONFIG_KVM is set on a per-target basis. commit 53b67b3052f39b049bc7c79ae1ce132c90098c6c Author: Blue Swirl Date: Mon Mar 29 19:23:52 2010 +0000 Compile acpi only once Also regressed -enable-kvm because of a thinko. Once we make these changes, the if(0) magic of kvm_enabled() no longer works so we need empty stub functions. Signed-off-by: Anthony Liguori --- hw/acpi.c | 3 +- kvm-generic.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ kvm.h | 9 ++-- 3 files changed, 139 insertions(+), 6 deletions(-) create mode 100644 kvm-generic.c diff --git a/hw/acpi.c b/hw/acpi.c index 33c6bc8..5c01c2e 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -529,7 +529,8 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, s); - if (kvm_enabled) { + s->kvm_enabled = kvm_enabled; + if (s->kvm_enabled) { /* Mark SMM as already inited to prevent SMM from running. KVM does not * support SMM mode. */ pci_conf[0x5B] = 0x02; diff --git a/kvm-generic.c b/kvm-generic.c new file mode 100644 index 0000000..c67fb55 --- /dev/null +++ b/kvm-generic.c @@ -0,0 +1,133 @@ +/* + * QEMU KVM support + * + * Copyright IBM, Corp. 2010 + * Red Hat, Inc. 2008 + * + * Authors: + * Anthony Liguori + * Glauber Costa + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu-common.h" +#include "cpu.h" +#include "kvm.h" + +int kvm_init(int smp_cpus) +{ + return -ENOSYS; +} + +int kvm_init_vcpu(CPUState *env) +{ + return -ENOSYS; +} + +int kvm_cpu_exec(CPUState *env) +{ + return -ENOSYS; +} + +int kvm_log_start(target_phys_addr_t phys_addr, ram_addr_t size) +{ + return -ENOSYS; +} + +int kvm_log_stop(target_phys_addr_t phys_addr, ram_addr_t size) +{ + return -ENOSYS; +} + +int kvm_has_sync_mmu(void) +{ + return -ENOSYS; +} + +int kvm_has_vcpu_events(void) +{ + return -ENOSYS; +} + +int kvm_has_robust_singlestep(void) +{ + return -ENOSYS; +} + +void kvm_setup_guest_memory(void *start, size_t size) +{ +} + +int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size) +{ + return -ENOSYS; +} + +int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size) +{ + return -ENOSYS; +} + +void kvm_flush_coalesced_mmio_buffer(void) +{ +} + +int kvm_insert_breakpoint(CPUState *current_env, target_ulong addr, + target_ulong len, int type) +{ + return -ENOSYS; +} + +int kvm_remove_breakpoint(CPUState *current_env, target_ulong addr, + target_ulong len, int type) +{ + return -ENOSYS; +} + +void kvm_remove_all_breakpoints(CPUState *current_env) +{ +} + +int kvm_update_guest_debug(CPUState *env, unsigned long reinject_trap) +{ + return -ENOSYS; +} + +#ifndef _WIN32 +int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset) +{ + return -ENOSYS; +} +#endif + +int kvm_pit_in_kernel(void) +{ + return -ENOSYS; +} + +int kvm_irqchip_in_kernel(void) +{ + return -ENOSYS; +} + +void kvm_cpu_synchronize_state(CPUState *env) +{ +} + +void kvm_cpu_synchronize_post_reset(CPUState *env) +{ +} + +void kvm_cpu_synchronize_post_init(CPUState *env) +{ +} + +/* This is evil but the KVM PPC code needs refactoring */ +void kvmppc_init(void); + +void kvmppc_init(void) +{ +} diff --git a/kvm.h b/kvm.h index 4f77188..9f57fd5 100644 --- a/kvm.h +++ b/kvm.h @@ -19,11 +19,10 @@ extern int kvm_allowed; -#ifdef CONFIG_KVM -#define kvm_enabled() (kvm_allowed) -#else -#define kvm_enabled() (0) -#endif +static inline int kvm_enabled(void) +{ + return kvm_allowed; +} struct kvm_run;