From patchwork Thu May 9 22:26:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163787 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp1586549ilr; Thu, 9 May 2019 15:51:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqwTcquqjilwGgWv3/0x90UMsli9Xc0U8TCMvkpJoNzqv7sgFLHnj6qpYP7VTkxMfbC6SbYB X-Received: by 2002:a1c:f901:: with SMTP id x1mr4776636wmh.136.1557442305257; Thu, 09 May 2019 15:51:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557442305; cv=none; d=google.com; s=arc-20160816; b=ypzj7RJYYBAkS3NsI0nUw6//1IX/m/1MuWzIOteVkbSLaUwE+X7arJhcivUNfCyvoE q1dRO6FEFWRcY5VuU3J16nM0tZVHbeKMhqjK4LFlTSNH5eEVy7u/LN0C2MKWmnY1e6X4 Ne7xFkq/nLl/53gmo5jW7bg2sJzdgoWBkSOymJeMJ+pclzPglYcC92unf87T9vt93XCv m3CxF3Na5ZY0ppAqm73phbTg2UxkB/OmbPsbFUJn5r2dzT+iq8pguz1U7TIfigByVzRd Cn3u7XjunJ52uD0ZwSZ+cktrfY8B4mnwf1bb/ZDNv6quCEbDgY7IjrG8eaUwXVsh5HVE CKcQ== 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=Pawv8gVKgvIshmjx0BG7faLy+gIe8qsSKFcm+yZ5sy0=; b=0UhsyikDV7b67mKFcrdS2e7fc4SJETDc20zXhgHa0e0CIiyQPf7RT2JrquIRzN1FnA /2UwXqpzhUEZ6m3TV4ogOqnMUi1F35k5JNUnylW+Fe9XLIqQylOJPpku6w5ETuoEmhxh QWKZcl/tTFmn0CzmOo5PNUoZjnzzVJTZ8XGluH/mN/C2GFDG6nZgiSOKI9TatQJ7WoBl P+ctOYR4MErE+vMjtD4uwNiUAOmX4WGSikaEY0S6o0VzgoRwPK0zwTbUM3xlWY7PPOia wbMBTI1gGAVu7Sv43TSpTA0qOzz4dxVCu8LQNYkFgnynLP8ILxxAndhFVOhnof449ePL DNPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QYz7CEJO; 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 y11si2960392wrn.56.2019.05.09.15.51.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 May 2019 15:51:45 -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=QYz7CEJO; 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]:33821 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOrtA-00049Z-6Z for patch@linaro.org; Thu, 09 May 2019 18:51:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOrVL-0007xH-Pl for qemu-devel@nongnu.org; Thu, 09 May 2019 18:27:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOrVJ-0005bQ-69 for qemu-devel@nongnu.org; Thu, 09 May 2019 18:27:07 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:33754) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOrVG-0005aH-7y for qemu-devel@nongnu.org; Thu, 09 May 2019 18:27:04 -0400 Received: by mail-pl1-x642.google.com with SMTP id y3so1819871plp.0 for ; Thu, 09 May 2019 15:27:01 -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=Pawv8gVKgvIshmjx0BG7faLy+gIe8qsSKFcm+yZ5sy0=; b=QYz7CEJOpCCzIzxIaLaOuDxGP0wFO+2/A3mDz2zV5UgfJ0a67XZMfp1/M29q0YGbqt bHY43tPVk7tVNK1WfGnpRoZNrtqm+vkr0uN+ALnefC9V7Sf2EQjLw24tPrlKFmA9fSZb S/eMwwzy00sfZYeZAkMROtJ5223Po5QtWuH+qbZzz2USuwl6D5dx2Oo0B9dUOIFOFnBE 89yX2ErWgwgAOpY53dwBYnXpgXF9ZPA3mnVRin95tWhfBbwYbX6UIDyg+zt/bUWi0AXk 502KgQK/JFAhEbfF6RM7HiITK0+7lFL/tL1GoDZmYAO30H7UubVGf8Oas2GzrB14CZqf GbeA== 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=Pawv8gVKgvIshmjx0BG7faLy+gIe8qsSKFcm+yZ5sy0=; b=d/A7D+foJMDjgKgUzO49cPk1aixF9BHlSXykWO/i8ir7o9p8Kw/ko2KXS4IW7bZuzi knmEaRwfHRNrtovjdDF7SxvHA/xAhlsoeRQQMNSkJXvTQp1k7eLpiLVTEP3YadfzQleX 1HQnpz/ZoY0+orjAuk78b7j8cAwDLPadQ+6CaaYfCfMCu7fblV2bWPxu5wE4gzP9SriD 5pFbIGI9Mc/kTXioRRvB+47wrflcsNZzEmyMkg35Iisdg7dnwxJWpZCNayrtn69ozjiO xH9iroG4SPbAiduVZEs+6bNMmaVW3ToBFsXtom5kk5KV6SsM+j/FZPEc3Mu/kapWN6H/ RliQ== X-Gm-Message-State: APjAAAXcWzX2f3MEpQGgGjoqiDOWQP/+isDIxZKaf3tvmuPnxu4VyRtc iPvp/NrPcXGszqftLzdMTv2IaYlObzc= X-Received: by 2002:a17:902:704c:: with SMTP id h12mr8532139plt.270.1557440820301; Thu, 09 May 2019 15:27:00 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id m2sm4490521pfi.24.2019.05.09.15.26.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 May 2019 15:26:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 15:26:24 -0700 Message-Id: <20190509222631.14271-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190509222631.14271-1-richard.henderson@linaro.org> References: <20190509222631.14271-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::642 Subject: [Qemu-devel] [PATCH v3 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. v3: Assert !probe for sparc32. --- target/sparc/cpu.h | 5 ++-- target/sparc/cpu.c | 5 ++-- target/sparc/ldst_helper.c | 11 +------- target/sparc/mmu_helper.c | 58 ++++++++++++++++++++++++-------------- 4 files changed, 43 insertions(+), 36 deletions(-) -- 2.17.1 Reviewed-by: Peter Maydell 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..facc0c60e9 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; @@ -218,16 +220,26 @@ int sparc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, target_ulong page_size; int error_code = 0, prot, access_index; + /* + * TODO: If we ever need tlb_vaddr_to_host for this target, + * then we must figure out how to manipulate FSR and FAR + * when both MMU_NF and probe are set. In the meantime, + * do not support this use case. + */ + assert(!probe); + 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 */ @@ -243,14 +255,14 @@ 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; + return true; } else { - if (rw & 2) { + if (access_type == MMU_INST_FETCH) { cs->exception_index = TT_TFAULT; } else { cs->exception_index = TT_DFAULT; } - return 1; + cpu_loop_exit_restore(cs, retaddr); } } @@ -713,8 +725,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; @@ -725,8 +738,9 @@ 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); - 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 +748,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)