From patchwork Fri Nov 4 20:50:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 9413173 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 5BA3E60585 for ; Fri, 4 Nov 2016 20:51:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 492752A9B0 for ; Fri, 4 Nov 2016 20:51:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D9362AC90; Fri, 4 Nov 2016 20:51:53 +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 1E1E128E89 for ; Fri, 4 Nov 2016 20:51:51 +0000 (UTC) Received: from localhost ([::1]:40710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c2lSn-0000R2-Ps for patchwork-qemu-devel@patchwork.kernel.org; Fri, 04 Nov 2016 16:51:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c2lSC-0000Q9-LJ for qemu-devel@nongnu.org; Fri, 04 Nov 2016 16:51:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c2lSA-0003be-Gs for qemu-devel@nongnu.org; Fri, 04 Nov 2016 16:51:12 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:35908) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c2lSA-0003ad-AR for qemu-devel@nongnu.org; Fri, 04 Nov 2016 16:51:10 -0400 Received: by mail-wm0-x241.google.com with SMTP id c17so5604893wmc.3 for ; Fri, 04 Nov 2016 13:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=4HkbtvFXK+RW12MnSWso0/YVtoN1mCfxIWUpgkY3OHM=; b=D7x7WmLMHZG5oiI4F/P/LvRoexcmbwjchYFpR99bRe6gzIQau5q3UKcHsGKwcqB7rf W36aWdjI+HrPLMsGqz61xYzPAc94ulGHoG1OZU7ARHNUwsZk5Y5D4kgY2b6uJmjkn9NI q4Yd0IWF1Xrp31nB5bmXg2B8w/QO4eqJvA0j1n8uLOYIlQihckfBO/PKhx6Rn0tQmsXg iXjGAQMMvZwRJf2/tStuHGBkCUS5ek6R7J8+oY3IX1yCgOfYJTVT4sKXZnCv++ZTsS9q Ql8594q3TXVtjP4MRIDqiXsiIhjnVO+q0008ARtby/FLYBgaNTq+/OVYvWLkg4Vv/Co+ 6xeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=4HkbtvFXK+RW12MnSWso0/YVtoN1mCfxIWUpgkY3OHM=; b=KjQMVNHkPuT0vr2/mfyNkuCYljQ0N/efeJuJToDrLHqNSONOv6TjgDfEtVW9CVLp5N 43QItQ/14AqC476EQ+BpekmsiIDkY0Y/p5hUVuUXwW+y6sFZ8TX1jIEDgU9DLN6cL5PP b4h06c1PMfGQzBrY+ve1PWiq+9TL8MA0mVd//PRV4LaMeda8lOuPHTRmYHfa8XuyOa7A YduZcey8lwQyqp3LdFGmBVRkBiHGSLr0bzYiIBg7pypzsozsMBqHuGs8wgPadjYZscES 9ANyfmZTf8KSD+TeAQDXt09V1S2Sg4hKhNKTzy5QlU39zOZRzoRbq5AddsT7S/JrBB2m BGwA== X-Gm-Message-State: ABUngvdQVnqKstJyGlxM5HCz+IGFTeTyqddA5TYqfCMYwfm/yIJX1cWa7OBg8MtQflZ4Mw== X-Received: by 10.194.0.167 with SMTP id 7mr12623581wjf.80.1478292669170; Fri, 04 Nov 2016 13:51:09 -0700 (PDT) Received: from localhost (x55b4b5cf.dyn.telefonica.de. [85.180.181.207]) by smtp.gmail.com with ESMTPSA id k74sm6448130wmd.18.2016.11.04.13.51.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Nov 2016 13:51:08 -0700 (PDT) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Fri, 4 Nov 2016 21:50:02 +0100 Message-Id: <7b3b6f6a47306f204437e46005ed2098545e6c80.1478291230.git.atar4qemu@gmail.com> 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:c09::241 Subject: [Qemu-devel] [PATCH v1 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