From patchwork Thu May 9 06:02:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163679 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp553605ilr; Wed, 8 May 2019 23:18:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqxZJc1+bj744RIiUKPkpQO2kXy1U/ZESF1/uzVY7PIxuJ938OjRLr1UbgBWQ9f6Leu8b8hN X-Received: by 2002:adf:e712:: with SMTP id c18mr1395160wrm.202.1557382722816; Wed, 08 May 2019 23:18:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557382722; cv=none; d=google.com; s=arc-20160816; b=z0NpTAW/jkVZysrHIMfrnZmOBaVXlrucsUNGT5SLOJrUjjzC7PMk1fx0KouYAUFhhq IpHBWz99Yyw2e6eTiKrsgpsPNM1L12svW2rLCkjbNpfGj7OCd8R/oqDQ+PZvdwvyK9V9 gMTxpy/hicFyukHB7PGOI18Z0I+k1tU+fmGcNaxplYYCRy3TNqDb9s4jm3XiFo3bSElB C4gBgX3DDAE/XaSqaeW7z3EJe+H6RYjOHojMUOB/Akam0A7l1YLP83i1qanzBBGoUXvt 8cKKOSQko69/rknzFadq1ggOG7uarwzDIkAreVooWtBdmjQUknbXg+/RS9FGfFl4Ij52 3Cqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=H2QT/JgMiYgSHVXC+HP+NSmIDhr8i4LWMx/ucpMQgvg=; b=GhkHjQfKYaew9Q4UsYCMFmiZyhuj3wRCKGOXkBYn6tBFh8oBakF6yIXG7+UJWz2uKJ 6r6b1BeBGUs96ap/Dig0ki6AZq3TZTzYmY3/SYpv+AlvQgXPiX16IQEYOasrWDNoyRMN dbtLHqgZwj0D1JNOSWcTfdsuSGW7hvmTLiDgia/6sePnyAJlD9uezBATjlN7kjoJ3ltT hkoQD7nLWsrVttVNCZxowsZqV0QeT3NJin/dzrsiyf6VbrQ5GfHFvjgv2KPxb5yjU/5I VC20J36tx0m631FR0zYVpkK9twz1KUYdNyufZpPavi9EzWm1PH4cPVtKEW/uqiiPMhDM tIkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jX82uMqx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x65si831039wmf.174.2019.05.08.23.18.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 08 May 2019 23:18:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jX82uMqx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:48789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOcO9-0004JT-K5 for patch@linaro.org; Thu, 09 May 2019 02:18:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOc9K-0006IX-1R for qemu-devel@nongnu.org; Thu, 09 May 2019 02:03:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOc9E-0007F2-KR for qemu-devel@nongnu.org; Thu, 09 May 2019 02:03:21 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:46869) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOc9E-0007EZ-Cg for qemu-devel@nongnu.org; Thu, 09 May 2019 02:03:16 -0400 Received: by mail-pf1-x444.google.com with SMTP id y11so702824pfm.13 for ; Wed, 08 May 2019 23:03:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=H2QT/JgMiYgSHVXC+HP+NSmIDhr8i4LWMx/ucpMQgvg=; b=jX82uMqx0G7AB+n5uSgRtY6LmAA+jKlcyL9Jh7PbrUMJI4zk0Z9A26jd8qa3MZW+kC tX73eZXpx/pF8fCY7FS511pMpfxrB6jOb3VD6srFGuhbqEml8sOfjHN2AtnMWBay2I/W XU6Y34Srt1AOZXlif2H3rfK1KMB/93Z4Znzb41uQdJ6dl5aKnWVNJKvAwJ+gKRDtkopl jvu8i5pWrru6TRaVcqX3maSd4fhh8YOjgopXPzdIHa8RkaEJCznx3Jv5d7epVeozHeWh HBYUk/ZmVW0ks6r5JqsGwWGi9wDSKrdRkJjwY1CqGXmUmP6lMHaj4e6770Bq3ZZxwwl/ Zq3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=H2QT/JgMiYgSHVXC+HP+NSmIDhr8i4LWMx/ucpMQgvg=; b=Iu7m+uSgezl024qltfN1sNEe36MmhILSGNE+aTrcyyZwJZ0KL/i9Z96tkOrWSkCCux 6wCOJOCMafvYRdgOHKd4p28yZsIk3f0fX6VkN5xRrbw2OBeLzdv3WiGAOh8jHCGsdefK YMNlXEtSNmqbc3z0ftnG9Gxe+NK/2O0KtlcqRJCQPq3NP5nY8stNspeyuGz0pd5Yjlbr AC27s+7+x8H2btJ4w6/moVWFbDJIQQz461ej2/N5l8I7eC/vUFK3E0xwKisgHHDjCp+r QXM+nFKwByt/PGx0EbV91iJgs5HmrYU7AaX4SOWDF6ppxN+nPB5r5aquC3OtbjGocu5v hTrg== X-Gm-Message-State: APjAAAUugFhWZTf5HkiIMgHQdbUQSaW3P2JJ6TIFXDcExHMMrBcCW2id k5n4erurDowR2V3ZtP2KRZPiIVN5Fx0= X-Received: by 2002:a63:2a89:: with SMTP id q131mr3044519pgq.359.1557381795167; Wed, 08 May 2019 23:03:15 -0700 (PDT) Received: from localhost.localdomain (97-113-27-95.tukw.qwest.net. [97.113.27.95]) by smtp.gmail.com with ESMTPSA id n7sm1496109pff.45.2019.05.08.23.03.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 23:03:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 8 May 2019 23:02:39 -0700 Message-Id: <20190509060246.4031-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190509060246.4031-1-richard.henderson@linaro.org> References: <20190509060246.4031-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 Subject: [Qemu-devel] [PATCH v2 20/27] target/sparc: Convert to CPUClass::tlb_fill 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: Mark Cave-Ayland , Artyom Tarasenko Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: Artyom Tarasenko Cc: Mark Cave-Ayland Signed-off-by: Richard Henderson --- v2: Keep user-only, sparc32, and sparc64 tlb_fill separate. --- target/sparc/cpu.h | 5 ++- target/sparc/cpu.c | 5 +-- target/sparc/ldst_helper.c | 11 +----- target/sparc/mmu_helper.c | 78 ++++++++++++++++++++++---------------- 4 files changed, 51 insertions(+), 48 deletions(-) -- 2.17.1 diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 85b9665ccc..f31e8535df 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -579,8 +579,9 @@ void cpu_raise_exception_ra(CPUSPARCState *, int, uintptr_t) QEMU_NORETURN; void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu); void sparc_cpu_list(void); /* mmu_helper.c */ -int sparc_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw, - int mmu_idx); +bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr); target_ulong mmu_probe(CPUSPARCState *env, target_ulong address, int mmulev); void dump_mmu(CPUSPARCState *env); diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 4654c2a6a0..f93ce72eb9 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -875,9 +875,8 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) cc->synchronize_from_tb = sparc_cpu_synchronize_from_tb; cc->gdb_read_register = sparc_cpu_gdb_read_register; cc->gdb_write_register = sparc_cpu_gdb_write_register; -#ifdef CONFIG_USER_ONLY - cc->handle_mmu_fault = sparc_cpu_handle_mmu_fault; -#else + cc->tlb_fill = sparc_cpu_tlb_fill; +#ifndef CONFIG_USER_ONLY cc->do_unassigned_access = sparc_cpu_unassigned_access; cc->do_unaligned_access = sparc_cpu_do_unaligned_access; cc->get_phys_page_debug = sparc_cpu_get_phys_page_debug; diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c index a7fcb84ac0..2558c08a64 100644 --- a/target/sparc/ldst_helper.c +++ b/target/sparc/ldst_helper.c @@ -1925,18 +1925,9 @@ void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cs, vaddr addr, cpu_raise_exception_ra(env, TT_UNALIGNED, retaddr); } -/* try to fill the TLB and return an exception if error. If retaddr is - NULL, it means that the function was called in C code (i.e. not - from generated code or from helper.c) */ -/* XXX: fix it to restore all registers */ void tlb_fill(CPUState *cs, target_ulong addr, int size, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) { - int ret; - - ret = sparc_cpu_handle_mmu_fault(cs, addr, size, access_type, mmu_idx); - if (ret) { - cpu_loop_exit_restore(cs, retaddr); - } + sparc_cpu_tlb_fill(cs, addr, size, access_type, mmu_idx, false, retaddr); } #endif diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c index afcc5b617d..7f811ea031 100644 --- a/target/sparc/mmu_helper.c +++ b/target/sparc/mmu_helper.c @@ -27,13 +27,14 @@ #if defined(CONFIG_USER_ONLY) -int sparc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, - int mmu_idx) +bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { SPARCCPU *cpu = SPARC_CPU(cs); CPUSPARCState *env = &cpu->env; - if (rw & 2) { + if (access_type == MMU_INST_FETCH) { cs->exception_index = TT_TFAULT; } else { cs->exception_index = TT_DFAULT; @@ -43,7 +44,7 @@ int sparc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, env->mmuregs[4] = address; #endif } - return 1; + cpu_loop_exit_restore(cs, retaddr); } #else @@ -208,8 +209,9 @@ static int get_physical_address(CPUSPARCState *env, hwaddr *physical, } /* Perform address translation */ -int sparc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, - int mmu_idx) +bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { SPARCCPU *cpu = SPARC_CPU(cs); CPUSPARCState *env = &cpu->env; @@ -220,22 +222,18 @@ int sparc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, address &= TARGET_PAGE_MASK; error_code = get_physical_address(env, &paddr, &prot, &access_index, - address, rw, mmu_idx, &page_size); + address, access_type, + mmu_idx, &page_size); vaddr = address; - if (error_code == 0) { + if (likely(error_code == 0)) { qemu_log_mask(CPU_LOG_MMU, - "Translate at %" VADDR_PRIx " -> " TARGET_FMT_plx ", vaddr " - TARGET_FMT_lx "\n", address, paddr, vaddr); + "Translate at %" VADDR_PRIx " -> " + TARGET_FMT_plx ", vaddr " TARGET_FMT_lx "\n", + address, paddr, vaddr); tlb_set_page(cs, vaddr, paddr, prot, mmu_idx, page_size); - return 0; + return true; } - if (env->mmuregs[3]) { /* Fault status register */ - env->mmuregs[3] = 1; /* overflow (not read before another fault) */ - } - env->mmuregs[3] |= (access_index << 5) | error_code | 2; - env->mmuregs[4] = address; /* Fault address register */ - if ((env->mmuregs[0] & MMU_NF) || env->psret == 0) { /* No fault mode: if a mapping is available, just override permissions. If no mapping is available, redirect accesses to @@ -243,15 +241,25 @@ int sparc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, switching to normal mode. */ prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; tlb_set_page(cs, vaddr, paddr, prot, mmu_idx, TARGET_PAGE_SIZE); - return 0; - } else { - if (rw & 2) { - cs->exception_index = TT_TFAULT; - } else { - cs->exception_index = TT_DFAULT; - } - return 1; + return true; } + + if (probe) { + return false; + } + + if (env->mmuregs[3]) { /* Fault status register */ + env->mmuregs[3] = 1; /* overflow (not read before another fault) */ + } + env->mmuregs[3] |= (access_index << 5) | error_code | 2; + env->mmuregs[4] = address; /* Fault address register */ + + if (access_type == MMU_INST_FETCH) { + cs->exception_index = TT_TFAULT; + } else { + cs->exception_index = TT_DFAULT; + } + cpu_loop_exit_restore(cs, retaddr); } target_ulong mmu_probe(CPUSPARCState *env, target_ulong address, int mmulev) @@ -713,20 +721,22 @@ static int get_physical_address(CPUSPARCState *env, hwaddr *physical, } /* Perform address translation */ -int sparc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, - int mmu_idx) +bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { SPARCCPU *cpu = SPARC_CPU(cs); CPUSPARCState *env = &cpu->env; - target_ulong vaddr; hwaddr paddr; + target_ulong vaddr; target_ulong page_size; int error_code = 0, prot, access_index; address &= TARGET_PAGE_MASK; error_code = get_physical_address(env, &paddr, &prot, &access_index, - address, rw, mmu_idx, &page_size); - if (error_code == 0) { + address, access_type, + mmu_idx, &page_size); + if (likely(error_code == 0)) { vaddr = address; trace_mmu_helper_mmu_fault(address, paddr, mmu_idx, env->tl, @@ -734,10 +744,12 @@ int sparc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, env->dmmu.mmu_secondary_context); tlb_set_page(cs, vaddr, paddr, prot, mmu_idx, page_size); - return 0; + return true; } - /* XXX */ - return 1; + if (probe) { + return false; + } + cpu_loop_exit_restore(cs, retaddr); } void dump_mmu(CPUSPARCState *env)