From patchwork Fri Jul 8 20:38:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9221785 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 65DE460467 for ; Fri, 8 Jul 2016 20:39:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5757E284CF for ; Fri, 8 Jul 2016 20:39:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B390284D3; Fri, 8 Jul 2016 20:39:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A1BAB284CF for ; Fri, 8 Jul 2016 20:39:46 +0000 (UTC) Received: from localhost ([::1]:47763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLcYr-0000TD-2d for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Jul 2016 16:39:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLcYP-0000Sl-Eu for qemu-devel@nongnu.org; Fri, 08 Jul 2016 16:39:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLcYM-0003OR-KR for qemu-devel@nongnu.org; Fri, 08 Jul 2016 16:39:17 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34701) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLcYM-0003OJ-Ex for qemu-devel@nongnu.org; Fri, 08 Jul 2016 16:39:14 -0400 Received: by mail-qt0-x243.google.com with SMTP id c52so152389qte.1 for ; Fri, 08 Jul 2016 13:39:14 -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:in-reply-to:references; bh=g7l7jJ+GZpJPMdrGojgbXvbit6wBhHAiuif83UmIFyQ=; b=girqxifbZXEMCrqWKE4DQiz6hw46+o4AZBpptkiuGytc85NhUQkHRww11qljUyFlTD 00h6X06VEGyqTK9BKtkmCcZlhGg64l/U1K6X4z3agCYN+X1FElrKhGfY7wLK+OtX+hIX AolZT7KX6HCpH5oNBBHyhyz+Rz6LxrRdOzqh3BV/OWkCzyDVUSfHdEMEeDA0DrLfxaDh YEQuR0JEaxR9bVh5FZ76JZ81cFlsl0vsyySjD2/T16P4+VXbWT6qly2hRfKf+HDmakQ3 2s7jBFoo5VNK2UbMkuTKa8H13EdYVS0bD8z3GpzONTMAoQZ4Wp2SICKCntYJsjH8Z/6X JOdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=g7l7jJ+GZpJPMdrGojgbXvbit6wBhHAiuif83UmIFyQ=; b=PA+oioCvQqHAYSxC60v4ruIEFIobWElZN+WCmlmnAo8GLAt6mHpOPzAM1Nim85zA9d gIePPnFoSmdnCnClfwOYur7l1St29aCCc6FtZvL9d+l8JKNzYUDuNMSv7nmuQipoF1sz MxeLSlGhVkXaQhlN1++gFUZY7sAnsvMu4kZV2p6TshRjAJ3Sx9C1xCzQR4L52/DMvQHr 9licL6nC/Aa6Ww/OaSP9KZ+DXgBGWVekvZM7CndfLgBsqt/uvG9fH4NgenCSB6F3P7AK Z1jjbv3hGMiR6GgTfHHSBqeBQQ4ZVh55kCSTxax7PjY8sdD1ML6F2pTYRwisVHRtv1+3 egXg== X-Gm-Message-State: ALyK8tKDgiNSTJHxfN3VrbrtmxqUjOUVoXiizw1h0oGC00G8uIBUbAeL4X37eGcKMC26Qw== X-Received: by 10.237.37.142 with SMTP id x14mr12066175qtc.9.1468010353972; Fri, 08 Jul 2016 13:39:13 -0700 (PDT) Received: from bigtime.com (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id f53sm1359944qtf.25.2016.07.08.13.39.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jul 2016 13:39:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 8 Jul 2016 13:38:36 -0700 Message-Id: <1468010319-16494-2-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468010319-16494-1-git-send-email-rth@twiddle.net> References: <1468010319-16494-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PULL 1/4] cputlb: Move VICTIM_TLB_HIT out of line X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP There are currently 22 invocations of this function, and we're about to increase that number. Signed-off-by: Richard Henderson --- cputlb.c | 29 +++++++++++++++++++++++++++++ softmmu_template.h | 25 ------------------------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/cputlb.c b/cputlb.c index 079e497..7518544 100644 --- a/cputlb.c +++ b/cputlb.c @@ -498,6 +498,35 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) return qemu_ram_addr_from_host_nofail(p); } +/* Return true if ADDR is present in the victim tlb, and has been copied + back to the main tlb. */ +static bool victim_tlb_hit(CPUArchState *env, size_t mmu_idx, size_t index, + size_t elt_ofs, target_ulong page) +{ + size_t vidx; + for (vidx = 0; vidx < CPU_VTLB_SIZE; ++vidx) { + CPUTLBEntry *vtlb = &env->tlb_v_table[mmu_idx][vidx]; + target_ulong cmp = *(target_ulong *)((uintptr_t)vtlb + elt_ofs); + + if (cmp == page) { + /* Found entry in victim tlb, swap tlb and iotlb. */ + CPUTLBEntry tmptlb, *tlb = &env->tlb_table[mmu_idx][index]; + CPUIOTLBEntry tmpio, *io = &env->iotlb[mmu_idx][index]; + CPUIOTLBEntry *vio = &env->iotlb_v[mmu_idx][vidx]; + + tmptlb = *tlb; *tlb = *vtlb; *vtlb = tmptlb; + tmpio = *io; *io = *vio; *vio = tmpio; + return true; + } + } + return false; +} + +/* Macro to call the above, with local variables from the use context. */ +#define VICTIM_TLB_HIT(TY) \ + victim_tlb_hit(env, mmu_idx, index, offsetof(CPUTLBEntry, TY), \ + addr & TARGET_PAGE_MASK) + #define MMUSUFFIX _mmu #define SHIFT 0 diff --git a/softmmu_template.h b/softmmu_template.h index 4d378ca..405ba35 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -116,31 +116,6 @@ # define helper_te_st_name helper_le_st_name #endif -/* macro to check the victim tlb */ -#define VICTIM_TLB_HIT(ty) \ -({ \ - /* we are about to do a page table walk. our last hope is the \ - * victim tlb. try to refill from the victim tlb before walking the \ - * page table. */ \ - int vidx; \ - CPUIOTLBEntry tmpiotlb; \ - CPUTLBEntry tmptlb; \ - for (vidx = CPU_VTLB_SIZE-1; vidx >= 0; --vidx) { \ - if (env->tlb_v_table[mmu_idx][vidx].ty == (addr & TARGET_PAGE_MASK)) {\ - /* found entry in victim tlb, swap tlb and iotlb */ \ - tmptlb = env->tlb_table[mmu_idx][index]; \ - env->tlb_table[mmu_idx][index] = env->tlb_v_table[mmu_idx][vidx]; \ - env->tlb_v_table[mmu_idx][vidx] = tmptlb; \ - tmpiotlb = env->iotlb[mmu_idx][index]; \ - env->iotlb[mmu_idx][index] = env->iotlb_v[mmu_idx][vidx]; \ - env->iotlb_v[mmu_idx][vidx] = tmpiotlb; \ - break; \ - } \ - } \ - /* return true when there is a vtlb hit, i.e. vidx >=0 */ \ - vidx >= 0; \ -}) - #ifndef SOFTMMU_CODE_ACCESS static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env, CPUIOTLBEntry *iotlbentry,