From patchwork Wed Jan 24 23:26:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 125739 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp738098ljf; Wed, 24 Jan 2018 15:44:02 -0800 (PST) X-Google-Smtp-Source: AH8x227MJxM1Hzy6550u6/ymmMsMLBvlw+gL6TEHeCuoNfePBSvoJdI/3vRri2P8LQYa4iUWlshm X-Received: by 10.129.157.17 with SMTP id u17mr6542744ywg.86.1516837442702; Wed, 24 Jan 2018 15:44:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516837442; cv=none; d=google.com; s=arc-20160816; b=sQHOsppvlvCSIKG90GnbwHHdufFxLh2hSr4zxIlAEMz1G55nL8Uov8EDMn+b3ccMVG RupsWdAre70H+ACYEcftBpwi4UORzJUKcsauPWymGVhniNsneh7voos3efPAwzlZNMo8 919Vz7vrrEWbZmPMK80sGrqIEdksDfxparjLFth2r+mmaoQ3BNrLyDFy64sxzjMQeYcp ezjVjXeXsp1yqwPPidXpCJA3kdVFscxXR+LTqvJl0fM6NxH30HGsWeQTQZ2X7/Dxe/y0 D74UFSp/nLh17l0HHN9z7JcivIeXL0Wt8+LQRUe1r30shsXN/0vonAt+ygiZjHI59S+M 7xJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=lvnCci7iV1I3qKNv3WOKkyQvm2uDS3zDbCwOpT7h1yY=; b=dP6+LvLa0HxfWI6NJNq3tj6iZ40dbdaPyOwAq5xxv173pPmwu+Ds9Bz0RnqGNYDor8 uA4UDUtJZ7zT7D44kOmvEF/ksKhj4GJElvTHR+eSDYsGq78QS419i+J5sWXWOMwxx1Tp XCy6RVoXNhvw1gXmHXAufWrp7y4n8vgzMcrnK2rShdwl5l+gu9y5KaYVGEl9Lx1yLHOw qEre4/pZWxdxDVR+4hQRHsIIEATsd00kXYIHUDjKhamlz1Ud6o7t8MZuvhCyn7P877Ci j4tW3205K+PwolO+pT4l5cTHGF88Z+2TgYmRFCnT0nLUvMfK8q51a5uls2ebQo9R52CS leMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dQmhO3Fb; 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 b196si241039ywe.362.2018.01.24.15.44.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 24 Jan 2018 15:44:02 -0800 (PST) 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=dQmhO3Fb; 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]:54557 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeUi2-0000fa-3l for patch@linaro.org; Wed, 24 Jan 2018 18:44:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeURq-000503-Hq for qemu-devel@nongnu.org; Wed, 24 Jan 2018 18:27:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeURo-00021g-FQ for qemu-devel@nongnu.org; Wed, 24 Jan 2018 18:27:18 -0500 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:39195) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eeURo-00021P-9X for qemu-devel@nongnu.org; Wed, 24 Jan 2018 18:27:16 -0500 Received: by mail-pg0-x242.google.com with SMTP id w17so3811372pgv.6 for ; Wed, 24 Jan 2018 15:27:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=lvnCci7iV1I3qKNv3WOKkyQvm2uDS3zDbCwOpT7h1yY=; b=dQmhO3FboENTGOc1gntb7l3eGJ8x4YzMX9Dml8MP0LD8VJuv/QR21z5UOZtBbTHDrf nmZ6xz8wpX5xzkkMnNxtqNbPsKX0AjH1ScqXJtXyDpKkU5uKxYQXTPfkcuH6wMmJi+lb p7JrBxJJvrIl/h9fjPx9ol2wbqwbf3yvxPYPI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=lvnCci7iV1I3qKNv3WOKkyQvm2uDS3zDbCwOpT7h1yY=; b=bnjG7xFUBTQW2akCncyfEGvCc3PphrfEQCS7IhM7tM4gz50VDZVMhEIZx+JOC1VCFd CtiC6aos0UsZyk6okYUcKNOaeKjwWoU1mIgWNCH70rcGMHCCvRS7SgEo9Om0N9jMUcOO ZBuVWXWPJ02a4Ab+GAw/kU+4ME4G35flAUtBGNrFCShJ+ujojDVfaDJFQFzwyr8uGHyo 1+0/YTMZKtaPGkWh5+BB2A+SibsQ2C/TaNZSPRiV2+rbG0+DuLiMnFq+M6/r5eUE051j 6C+zhr/L8FdcJO2OK0bzz+E2q3/rLFwUIi6Pi7hEXZFzNjRuhl+7NX6Airwsvkk0TuZo AAdw== X-Gm-Message-State: AKwxytfjmSIkxC/3lN/W//vmOmF0JdKSWBawhaItCrU8jVrH01rBPX/Z xKj69aoEuWcGchkSX3pk5Gr6m/KYv/g= X-Received: by 10.98.42.79 with SMTP id q76mr11209874pfq.23.1516836435037; Wed, 24 Jan 2018 15:27:15 -0800 (PST) Received: from cloudburst.twiddle.net (174-21-6-47.tukw.qwest.net. [174.21.6.47]) by smtp.gmail.com with ESMTPSA id z19sm9760028pfh.185.2018.01.24.15.27.13 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Jan 2018 15:27:13 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 Jan 2018 15:26:11 -0800 Message-Id: <20180124232625.30105-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180124232625.30105-1-richard.henderson@linaro.org> References: <20180124232625.30105-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:c05::242 Subject: [Qemu-devel] [PATCH v3 31/45] target/hppa: Implement B,GATE insn 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/hppa/cpu.h | 1 + target/hppa/mem_helper.c | 8 ++++++++ target/hppa/translate.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) -- 2.14.3 diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 8a87b8a9b3..79763b254c 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -353,6 +353,7 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, extern const MemoryRegionOps hppa_io_eir_ops; extern const struct VMStateDescription vmstate_hppa_cpu; void hppa_cpu_alarm_timer(void *); +int hppa_artype_for_page(CPUHPPAState *env, target_ulong vaddr); #endif void QEMU_NORETURN hppa_dynamic_excp(CPUHPPAState *env, int excp, uintptr_t ra); diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index fbe2e19d5d..c14317ebef 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -123,6 +123,7 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, break; default: /* execute: promote to privilege level type & 3 */ prot = x_prot; + break; } /* ??? Check PSW_P and ent->access_prot. This can remove PROT_WRITE. */ @@ -328,4 +329,11 @@ target_ureg HELPER(lpa)(CPUHPPAState *env, target_ulong addr) } return phys; } + +/* Return the ar_type of the TLB at VADDR, or -1. */ +int hppa_artype_for_page(CPUHPPAState *env, target_ulong vaddr) +{ + hppa_tlb_entry *ent = hppa_find_tlb(env, vaddr); + return ent ? ent->ar_type : -1; +} #endif /* CONFIG_USER_ONLY */ diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 24d357889e..5b7824f065 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -3782,6 +3782,53 @@ static DisasJumpType trans_bl(DisasContext *ctx, uint32_t insn, return do_dbranch(ctx, iaoq_dest(ctx, disp), link, n); } +static DisasJumpType trans_b_gate(DisasContext *ctx, uint32_t insn, + const DisasInsn *di) +{ + unsigned n = extract32(insn, 1, 1); + unsigned link = extract32(insn, 21, 5); + target_sreg disp = assemble_17(insn); + target_ureg dest = iaoq_dest(ctx, disp); + + /* Make sure the caller hasn't done something weird with the queue. + * ??? This is not quite the same as the PSW[B] bit, which would be + * expensive to track. Real hardware will trap for + * b gateway + * b gateway+4 (in delay slot of first branch) + * However, checking for a non-sequential instruction queue *will* + * diagnose the security hole + * b gateway + * b evil + * in which instructions at evil would run with increased privs. + */ + if (ctx->iaoq_b == -1 || ctx->iaoq_b != ctx->iaoq_f + 4) { + return gen_illegal(ctx); + } + +#ifndef CONFIG_USER_ONLY + if (ctx->tb_flags & PSW_C) { + CPUHPPAState *env = ctx->cs->env_ptr; + int type = hppa_artype_for_page(env, ctx->base.pc_next); + /* If we could not find a TLB entry, then we need to generate an + ITLB miss exception so the kernel will provide it. + The resulting TLB fill operation will invalidate this TB and + we will re-translate, at which point we *will* be able to find + the TLB entry and determine if this is in fact a gateway page. */ + if (type < 0) { + return gen_excp(ctx, EXCP_ITLB_MISS); + } + /* No change for non-gateway pages or for priv decrease. */ + if (type >= 4 && type - 4 < ctx->privilege) { + dest = deposit32(dest, 0, 2, type - 4); + } + } else { + dest &= -4; /* priv = 0 */ + } +#endif + + return do_dbranch(ctx, dest, link, n); +} + static DisasJumpType trans_bl_long(DisasContext *ctx, uint32_t insn, const DisasInsn *di) { @@ -3860,6 +3907,7 @@ static const DisasInsn table_branch[] = { { 0xe8004000u, 0xfc00fffdu, trans_blr }, { 0xe800c000u, 0xfc00fffdu, trans_bv }, { 0xe800d000u, 0xfc00dffcu, trans_bve }, + { 0xe8002000u, 0xfc00e000u, trans_b_gate }, }; static DisasJumpType trans_fop_wew_0c(DisasContext *ctx, uint32_t insn,