From patchwork Tue Jun 4 12:13:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 248550 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 72A3A2C007E for ; Tue, 4 Jun 2013 22:19:05 +1000 (EST) Received: from localhost ([::1]:37905 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjqCd-0005pt-DT for incoming@patchwork.ozlabs.org; Tue, 04 Jun 2013 08:19:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ujq8P-0008KI-MN for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:14:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ujq8L-0002ap-2D for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:14:41 -0400 Received: from mail-bk0-x235.google.com ([2a00:1450:4008:c01::235]:47283) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ujq8K-0002af-T0 for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:14:37 -0400 Received: by mail-bk0-f53.google.com with SMTP id mx10so88843bkb.26 for ; Tue, 04 Jun 2013 05:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=UKESPP+hk+92nFcCMvb/FiPgeQBAS83aZMZqKb4wPeM=; b=JqBM+pPRjnYtA/vtfpk6xT3f735qUfxRbT3hHwrJRy3MdKzBWB9M7TCJ9xtso4laZU G2NhLp9MZJGuigtpVeMhrsa6jL/B8L3YARd0/kPeq8gtLom+w6VViU9k/GQ+PSuKRsXv axjczYT8ZWWXIZ9hG8AV+fjmPp1g9dUPJs3qdFXFZ+XX2Bqn3jqsEHzdZ1O1XfOFvfCM TwAeeIVOilZGkJyzytWdztFoufmHvH3nvZiez0OzvzpGnQ0TEuExrjFVRAyekZXQimYH ulMuy7G8bUSr4MO/9Cqxz3ZXgCmbKEh1I9apCeHM/ejuZPIgX/A6kNecOEBrrgkxxeTm thuA== X-Received: by 10.205.17.193 with SMTP id qd1mr7868349bkb.88.1370348076163; Tue, 04 Jun 2013 05:14:36 -0700 (PDT) Received: from playground.lan (net-37-116-217-184.cust.dsl.vodafone.it. [37.116.217.184]) by mx.google.com with ESMTPSA id es13sm22715636bkc.8.2013.06.04.05.14.33 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Jun 2013 05:14:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2013 14:13:58 +0200 Message-Id: <1370348041-6768-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1370348041-6768-1-git-send-email-pbonzini@redhat.com> References: <1370348041-6768-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4008:c01::235 Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH v2 14/17] exec: check MRU in qemu_ram_addr_from_host X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This function is not used outside the iothread mutex, so it can use ram_list.mru_block. Signed-off-by: Paolo Bonzini --- exec.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index bf287cb..9fd4c90 100644 --- a/exec.c +++ b/exec.c @@ -1441,18 +1441,26 @@ int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr) return 0; } + block = ram_list.mru_block; + if (block && block->host && host - block->host < block->length) { + goto found; + } + QTAILQ_FOREACH(block, &ram_list.blocks, next) { /* This case append when the block is not mapped. */ if (block->host == NULL) { continue; } if (host - block->host < block->length) { - *ram_addr = block->offset + (host - block->host); - return 0; + goto found; } } return -1; + +found: + *ram_addr = block->offset + (host - block->host); + return 0; } /* Some of the softmmu routines need to translate from a host pointer