From patchwork Wed Jan 11 20:19:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 9511205 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 AF0F7606E1 for ; Wed, 11 Jan 2017 20:28:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E4222868B for ; Wed, 11 Jan 2017 20:28:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9278528689; Wed, 11 Jan 2017 20:28:08 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 3EF0128689 for ; Wed, 11 Jan 2017 20:28:08 +0000 (UTC) Received: from localhost ([::1]:56873 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRPV9-0004qA-Bs for patchwork-qemu-devel@patchwork.kernel.org; Wed, 11 Jan 2017 15:28:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRPNr-0006Js-V9 for qemu-devel@nongnu.org; Wed, 11 Jan 2017 15:20:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRPNq-0000v5-FC for qemu-devel@nongnu.org; Wed, 11 Jan 2017 15:20:35 -0500 Received: from mail-wj0-x244.google.com ([2a00:1450:400c:c01::244]:36489) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cRPNp-0000ul-Vm for qemu-devel@nongnu.org; Wed, 11 Jan 2017 15:20:34 -0500 Received: by mail-wj0-x244.google.com with SMTP id dh1so11795484wjb.3 for ; Wed, 11 Jan 2017 12:20:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=z/obmuncnhOqQFl0Hgn9j3nofY0F8ncTjLpFtBNJ89g=; b=CwH00hWPkrCSWggaJ/IZt9MRu/iGw2/yNYp8jGJOgNQMXaeRUf14JvGIJyhhI4r4IE qkb7+mfPp4KzBV1pD3MmFTcPNGZT1f5g249z2Y/nWwVIEtIW7fLmae9XHYBT4kqM0i33 MKXgAp5UeKjxNVkZeNa3P8/7K50D6yyzTBRrY0fQAC8EWc2FUslvLKkboLt/KRjSPRQp QqA836JnUc0QRUj9Ruce5d6EpTw7krRHaPm9inGNqH6kXKyCNcN2l8VFpCSCkLoIVk+l uNkTAejHLtLEzdjwBTTnVvYeSMQmjQHOhJI+cB91+tte4hKFrRrYIKpskDo+oIfVuL6R qXrQ== 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:in-reply-to:references; bh=z/obmuncnhOqQFl0Hgn9j3nofY0F8ncTjLpFtBNJ89g=; b=E1Pm+s557x+1jTQG/B7HGVH5eXGcG368EWNep+F/AL+JPbMWtorQWJwXTfZUfRXPWp aeH54usDQQUGa5hlpiyP9SmionefMSgM8rWpgSkHwyOXomvHwNYO3+dPskZzTSTKQnIK 70mJI0fb8Q2VNV6yZ44tp+aW6iIqu5DlsrutaHCosNHzZlYijbIwtmG1YDRv+e7JsGwu +sEbjHiLRBCs7va4SBd9HSMDcOYDZTsZuKlhIn5F5kXM8VG81qTHTzUhXwC9xrOvy+Et rmmrnlrMfE1hrZPdh+qfRThGYXnNwdePzx3lVN2xHg/ssan8SriRvVTJJTIB0i7TeG5c 9pMA== X-Gm-Message-State: AIkVDXIAXQxlgxaal558lXwtysTwIB/m4nNou+DIB5mTyc+yAIGb/NXMydCNjvN9A8w3tw== X-Received: by 10.194.2.110 with SMTP id 14mr6209882wjt.206.1484166032887; Wed, 11 Jan 2017 12:20:32 -0800 (PST) Received: from localhost (x55b4b54a.dyn.telefonica.de. [85.180.181.74]) by smtp.gmail.com with ESMTPSA id s20sm31518101wmb.9.2017.01.11.12.20.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jan 2017 12:20:31 -0800 (PST) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Wed, 11 Jan 2017 21:19:32 +0100 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c01::244 Subject: [Qemu-devel] [PATCH v2 01/30] target-sparc: ignore MMU-faults if MMU is disabled in hypervisor mode 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 , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP while IMMU/DMMU is disabled - ignore MMU-faults in hypervisorv mode or if CPU doesn't have hypervisor - signal TT_INSN_REAL_TRANSLATION_MISS/TT_DATA_REAL_TRANSLATION_MISS otherwise Signed-off-by: Artyom Tarasenko --- target/sparc/cpu.h | 2 ++ target/sparc/ldst_helper.c | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 5fb0ed1..e0b2806 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -68,6 +68,8 @@ #define TT_DATA_ACCESS 0x32 #define TT_UNALIGNED 0x34 #define TT_PRIV_ACT 0x37 +#define TT_INSN_REAL_TRANSLATION_MISS 0x3e +#define TT_DATA_REAL_TRANSLATION_MISS 0x3f #define TT_EXTINT 0x40 #define TT_IVEC 0x60 #define TT_TMISS 0x64 diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c index de7d53a..fdca87f 100644 --- a/target/sparc/ldst_helper.c +++ b/target/sparc/ldst_helper.c @@ -1664,14 +1664,25 @@ void sparc_cpu_unassigned_access(CPUState *cs, hwaddr addr, { SPARCCPU *cpu = SPARC_CPU(cs); CPUSPARCState *env = &cpu->env; - int tt = is_exec ? TT_CODE_ACCESS : TT_DATA_ACCESS; #ifdef DEBUG_UNASSIGNED printf("Unassigned mem access to " TARGET_FMT_plx " from " TARGET_FMT_lx "\n", addr, env->pc); #endif - cpu_raise_exception_ra(env, tt, GETPC()); + if (is_exec) { /* XXX has_hypervisor */ + if (env->lsu & (IMMU_E)) { + cpu_raise_exception_ra(env, TT_CODE_ACCESS, GETPC()); + } else if (cpu_has_hypervisor(env) && !(env->hpstate & HS_PRIV)) { + cpu_raise_exception_ra(env, TT_INSN_REAL_TRANSLATION_MISS, GETPC()); + } + } else { + if (env->lsu & (DMMU_E)) { + cpu_raise_exception_ra(env, TT_DATA_ACCESS, GETPC()); + } else if (cpu_has_hypervisor(env) && !(env->hpstate & HS_PRIV)) { + cpu_raise_exception_ra(env, TT_DATA_REAL_TRANSLATION_MISS, GETPC()); + } + } } #endif #endif