From patchwork Thu Jun 28 03:03:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 140402 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1653450ljj; Wed, 27 Jun 2018 20:18:13 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfq9vrhzgMBntMMh8P0dI4aJaZ3VBwOlw8mUveqimujXV6kUx89fjXkhGZgOCcOt1up/6D5 X-Received: by 2002:ac8:37b4:: with SMTP id d49-v6mr7937759qtc.369.1530155893483; Wed, 27 Jun 2018 20:18:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530155893; cv=none; d=google.com; s=arc-20160816; b=azfeYz665CTwsO8vCPDwQ4H90PFAO0aVzdy91yCbfhZOq0mLJsL47FG7dcY2tQfnzU J/4X/yMOzDKq0TRDet3M6KTLvVI4AwULkE5pbVoU4YRtVYTwZj5hfVWVlkHD/AkCnxP0 QfV0CYQKtxhgl4JmfIcp8X11jHa1uJR2U4dDG/oCjCC2fMs9M0/MpIFQpU2yZkkdBRkf yz63bqV/HwP7QkI/XXw2lRapTPBIjf20t3oOwY1xaXo6Whdgw9LY7MJp4FC0OxN7/Avj qaK2mxWrEgF09yrC5m6rZEMB0YhOcuLXZvCSEAYBU00CBAK/rQOJVsNDH2sy/XMkKZdV gv2w== 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:arc-authentication-results; bh=gqpkBrnMXmCHUNA04bgHmVGCH8EZrj3KsqVze2SkZ1g=; b=R/JBboHIH5uh3WDX/LsLqn/j+HxU+R9UMF18H4CRWs+iJu9uwJx4YqCYnGIQdyvZJY kcpQbDo9k7wbbMSJPJz9Fa9np3aT5XAhSd8nuaSxAiabjVb1hsKHZaPdc/3IYGEPHtDv Wyh3UwNCwvvav983hzsXOYMyS7mLYmsm1IdwwpCzrWc5u2/BJyAYKun+vVGIeEyRA9T8 DH3KvJjNU24+WX90Gn7VsUKY2srDy+Yn0sAv/XRjI8df1ac3JuNUfbtIPz4Jl8Gqzzdb WaD58OP2JBQkn0EoD/FgysWjhoexYhR6+Cdo1BXVttzHVT0xECxUoxrzcuIQe1VVL8iR vHdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UTkgQwfJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v188-v6si5440744qkc.16.2018.06.27.20.18.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 Jun 2018 20:18:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UTkgQwfJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:34311 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYNRk-0007gF-Ry for patch@linaro.org; Wed, 27 Jun 2018 23:18:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYNDy-000576-FV for qemu-devel@nongnu.org; Wed, 27 Jun 2018 23:03:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYNDw-00084X-MV for qemu-devel@nongnu.org; Wed, 27 Jun 2018 23:03:58 -0400 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]:45774) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYNDw-00083O-E0 for qemu-devel@nongnu.org; Wed, 27 Jun 2018 23:03:56 -0400 Received: by mail-pl0-x244.google.com with SMTP id bi1-v6so2004306plb.12 for ; Wed, 27 Jun 2018 20:03:56 -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=gqpkBrnMXmCHUNA04bgHmVGCH8EZrj3KsqVze2SkZ1g=; b=UTkgQwfJ+MjjxZ7AYSxpmb9xWGArMuqM5TYJDgHz2BB4uq3OY20h44dOMYweQQ8xA9 1oReLVMG/96naohA4sWHGp8wiA8ofHE6fcMxe3kNCXeNR4ApD/tPPoPwd6jRUiYbCf6d TfDGFMJt93emRLtIh0kgSBpSbqDencyDsd5Co= 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=gqpkBrnMXmCHUNA04bgHmVGCH8EZrj3KsqVze2SkZ1g=; b=UH1r+kDD6Jy8zHeD3ICazk6veIN4YG3dF5aVktE9/t1ApCnLzBEleNIwU7oGkHB+uR zDzSMSEO1Nm5tcwJOtKAG85hsCnITqZf7ydR6WIqs6zjHDVO2R0FjeXy22vm+Jq5EBCH jBcZzekBX/ZKLbPwW3OXkeQ3jcIAtxaw5Hg44AMQg7fA9uDiDtxlH5HQx1LY9FRcF6ow yhcOZiVzDibyMdVhDiUz1o/swYrNjOwTO2GTbOQ70lPTHoKVscVw6TnnwGJ3yCFJx49w zFrjGLrg46UWjHpqOZjEXNtz8VdpvN8KUO5aFw5FiVPGFh5xIlCIPhCnYAmsjPHE+wf+ wGyg== X-Gm-Message-State: APt69E2th7yV4wp+pWgpvnQEdfTfy4b4izeJ5FtLYwbZAc/WRvWbhBYu rQHBXw2dB7NbO9blpZF98FkhiNfvlLo= X-Received: by 2002:a17:902:7891:: with SMTP id q17-v6mr8781468pll.186.1530155035094; Wed, 27 Jun 2018 20:03:55 -0700 (PDT) Received: from cloudburst.twiddle.net (97-126-112-211.tukw.qwest.net. [97.126.112.211]) by smtp.gmail.com with ESMTPSA id y15-v6sm8030489pfm.136.2018.06.27.20.03.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Jun 2018 20:03:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 27 Jun 2018 20:03:23 -0700 Message-Id: <20180628030330.15615-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180628030330.15615-1-richard.henderson@linaro.org> References: <20180628030330.15615-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::244 Subject: [Qemu-devel] [PATCH v3 16/23] target/openrisc: Fix cpu_mmu_index 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: shorne@gmail.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The code in cpu_mmu_index does not properly honor SR_DME. This bug has workarounds elsewhere in that we flush the tlb more often than necessary, on the state changes that should be reflected in a change of mmu_index. Fixing this means that we can respect the mmu_index that is given to tlb_flush. Signed-off-by: Richard Henderson --- target/openrisc/cpu.h | 23 +++++++++++++-------- target/openrisc/interrupt.c | 4 ---- target/openrisc/interrupt_helper.c | 15 +++----------- target/openrisc/mmu.c | 33 +++++++++++++++++++++++++++--- target/openrisc/sys_helper.c | 4 ---- target/openrisc/translate.c | 2 +- 6 files changed, 49 insertions(+), 32 deletions(-) -- 2.17.1 diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index eaf6cdd40e..c3a968ec4d 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -385,9 +385,12 @@ void cpu_openrisc_count_stop(OpenRISCCPU *cpu); #include "exec/cpu-all.h" -#define TB_FLAGS_DFLAG 1 -#define TB_FLAGS_R0_0 2 +#define TB_FLAGS_SM SR_SM +#define TB_FLAGS_DME SR_DME +#define TB_FLAGS_IME SR_IME #define TB_FLAGS_OVE SR_OVE +#define TB_FLAGS_DFLAG 2 /* reuse SR_TEE */ +#define TB_FLAGS_R0_0 4 /* reuse SR_IEE */ static inline uint32_t cpu_get_gpr(const CPUOpenRISCState *env, int i) { @@ -405,17 +408,21 @@ static inline void cpu_get_tb_cpu_state(CPUOpenRISCState *env, { *pc = env->pc; *cs_base = 0; - *flags = (env->dflag - | (cpu_get_gpr(env, 0) == 0 ? TB_FLAGS_R0_0 : 0) - | (env->sr & SR_OVE)); + *flags = (env->dflag ? TB_FLAGS_DFLAG : 0) + | (cpu_get_gpr(env, 0) ? 0 : TB_FLAGS_R0_0) + | (env->sr & (SR_SM | SR_DME | SR_IME | SR_OVE)); } static inline int cpu_mmu_index(CPUOpenRISCState *env, bool ifetch) { - if (!(env->sr & SR_IME)) { - return MMU_NOMMU_IDX; + int ret = MMU_NOMMU_IDX; /* mmu is disabled */ + + if (env->sr & (ifetch ? SR_IME : SR_DME)) { + /* The mmu is enabled; test supervisor state. */ + ret = env->sr & SR_SM ? MMU_SUPERVISOR_IDX : MMU_USER_IDX; } - return (env->sr & SR_SM) == 0 ? MMU_USER_IDX : MMU_SUPERVISOR_IDX; + + return ret; } static inline uint32_t cpu_get_sr(const CPUOpenRISCState *env) diff --git a/target/openrisc/interrupt.c b/target/openrisc/interrupt.c index 23abcf29ed..138ad17f00 100644 --- a/target/openrisc/interrupt.c +++ b/target/openrisc/interrupt.c @@ -51,10 +51,6 @@ void openrisc_cpu_do_interrupt(CPUState *cs) env->eear = env->pc; } - /* For machine-state changed between user-mode and supervisor mode, - we need flush TLB when we enter&exit EXCP. */ - tlb_flush(cs); - env->esr = cpu_get_sr(env); env->sr &= ~SR_DME; env->sr &= ~SR_IME; diff --git a/target/openrisc/interrupt_helper.c b/target/openrisc/interrupt_helper.c index a2e9003969..9c5489f5f7 100644 --- a/target/openrisc/interrupt_helper.c +++ b/target/openrisc/interrupt_helper.c @@ -25,16 +25,7 @@ void HELPER(rfe)(CPUOpenRISCState *env) { - OpenRISCCPU *cpu = openrisc_env_get_cpu(env); -#ifndef CONFIG_USER_ONLY - int need_flush_tlb = (cpu->env.sr & (SR_SM | SR_IME | SR_DME)) ^ - (cpu->env.esr & (SR_SM | SR_IME | SR_DME)); - if (need_flush_tlb) { - CPUState *cs = CPU(cpu); - tlb_flush(cs); - } -#endif - cpu->env.pc = cpu->env.epcr; - cpu->env.lock_addr = -1; - cpu_set_sr(&cpu->env, cpu->env.esr); + env->pc = env->epcr; + env->lock_addr = -1; + cpu_set_sr(env, env->esr); } diff --git a/target/openrisc/mmu.c b/target/openrisc/mmu.c index 856969a7f2..b293b64e98 100644 --- a/target/openrisc/mmu.c +++ b/target/openrisc/mmu.c @@ -246,9 +246,36 @@ hwaddr openrisc_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) void tlb_fill(CPUState *cs, target_ulong addr, int size, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) { - int ret = openrisc_cpu_handle_mmu_fault(cs, addr, size, - access_type, mmu_idx); - if (ret) { + OpenRISCCPU *cpu = OPENRISC_CPU(cs); + int ret, prot = 0; + hwaddr physical = 0; + + if (mmu_idx == MMU_NOMMU_IDX) { + ret = get_phys_nommu(&physical, &prot, addr); + } else { + bool super = mmu_idx == MMU_SUPERVISOR_IDX; + if (access_type == MMU_INST_FETCH) { + ret = get_phys_code(cpu, &physical, &prot, addr, 2, super); + } else { + ret = get_phys_data(cpu, &physical, &prot, addr, + access_type == MMU_DATA_STORE, super); + } + } + + if (ret == TLBRET_MATCH) { + tlb_set_page(cs, addr & TARGET_PAGE_MASK, + physical & TARGET_PAGE_MASK, prot, + mmu_idx, TARGET_PAGE_SIZE); + } else if (ret < 0) { + int rw; + if (access_type == MMU_INST_FETCH) { + rw = 2; + } else if (access_type == MMU_DATA_STORE) { + rw = 1; + } else { + rw = 0; + } + cpu_openrisc_raise_mmu_exception(cpu, addr, rw, ret); /* Raise Exception. */ cpu_loop_exit_restore(cs, retaddr); } diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index c9702cd26c..852b219f9b 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -56,10 +56,6 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb) break; case TO_SPR(0, 17): /* SR */ - if ((env->sr & (SR_IME | SR_DME | SR_SM)) ^ - (rb & (SR_IME | SR_DME | SR_SM))) { - tlb_flush(cs); - } cpu_set_sr(env, rb); break; diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 64b5e84630..a271cd3903 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -55,7 +55,7 @@ static inline bool is_user(DisasContext *dc) #ifdef CONFIG_USER_ONLY return true; #else - return dc->mem_idx == MMU_USER_IDX; + return !(dc->tb_flags & TB_FLAGS_SM); #endif }