From patchwork Wed Oct 6 17:34:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 66950 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 85B41B70D5 for ; Thu, 7 Oct 2010 04:48:07 +1100 (EST) Received: from localhost ([127.0.0.1]:50913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P3Y60-000692-G5 for incoming@patchwork.ozlabs.org; Wed, 06 Oct 2010 13:48:04 -0400 Received: from [140.186.70.92] (port=35932 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P3Xy7-0001NO-VP for qemu-devel@nongnu.org; Wed, 06 Oct 2010 13:39:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P3Xy6-00078r-39 for qemu-devel@nongnu.org; Wed, 06 Oct 2010 13:39:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5928) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P3Xy5-00078Z-Sg for qemu-devel@nongnu.org; Wed, 06 Oct 2010 13:39:54 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o96HdqRR028948 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 6 Oct 2010 13:39:52 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o96HdpdW005532; Wed, 6 Oct 2010 13:39:51 -0400 Received: from amt.cnet (vpn-8-65.rdu.redhat.com [10.11.8.65]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o96Hdoat016089; Wed, 6 Oct 2010 13:39:50 -0400 Received: from amt.cnet (localhost.localdomain [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 2FBC268A0AE; Wed, 6 Oct 2010 14:38:56 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.4/8.14.4/Submit) id o96Hcsr4007269; Wed, 6 Oct 2010 14:38:54 -0300 Message-Id: <20101006173609.582518746@redhat.com> User-Agent: quilt/0.47-1 Date: Wed, 06 Oct 2010 14:34:30 -0300 From: Marcelo Tosatti To: kvm@vger.kernel.org, qemu-devel@nongnu.org References: <20101006173424.425523999@redhat.com> Content-Disposition: inline; filename=kvm_physical_memory_addr_from_ram X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Dean Nelson , Marcelo Tosatti , Huang Ying Subject: [Qemu-devel] [patch uq/master 6/8] Add RAM -> physical addr mapping in MCE simulation 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 From: Huang Ying In QEMU-KVM, physical address != RAM address. While MCE simulation needs physical address instead of RAM address. So kvm_physical_memory_addr_from_ram() is implemented to do the conversion, and it is invoked before being filled in the IA32_MCi_ADDR MSR. Reported-by: Dean Nelson Signed-off-by: Huang Ying Signed-off-by: Marcelo Tosatti Index: qemu/kvm-all.c =================================================================== --- qemu.orig/kvm-all.c +++ qemu/kvm-all.c @@ -137,6 +137,24 @@ static KVMSlot *kvm_lookup_overlapping_s return found; } +int kvm_physical_memory_addr_from_ram(KVMState *s, ram_addr_t ram_addr, + target_phys_addr_t *phys_addr) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(s->slots); i++) { + KVMSlot *mem = &s->slots[i]; + + if (ram_addr >= mem->phys_offset && + ram_addr < mem->phys_offset + mem->memory_size) { + *phys_addr = mem->start_addr + (ram_addr - mem->phys_offset); + return 1; + } + } + + return 0; +} + static int kvm_set_user_memory_region(KVMState *s, KVMSlot *slot) { struct kvm_userspace_memory_region mem; Index: qemu/kvm.h =================================================================== --- qemu.orig/kvm.h +++ qemu/kvm.h @@ -174,6 +174,9 @@ static inline void cpu_synchronize_post_ } } +int kvm_physical_memory_addr_from_ram(KVMState *s, ram_addr_t ram_addr, + target_phys_addr_t *phys_addr); + #endif int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val, bool assign);