From patchwork Wed Jul 31 20:38:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 170269 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4481866ile; Wed, 31 Jul 2019 13:53:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqzjRnGliZTcI4Te8QpC1N+t/GU0n236qc6FotZ8SfsMLTTJmXkYBUpw0WJAxkYfOrDeKpof X-Received: by 2002:a50:994f:: with SMTP id l15mr109697672edb.112.1564606382820; Wed, 31 Jul 2019 13:53:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564606382; cv=none; d=google.com; s=arc-20160816; b=0dyaisPz3VG9UDl/wjSJjbG2PyypJKOL8OWUd63E+5Via+5CVp9aViU69xYgZKB0xD mITMlUPus7LEgQp2VPP85QIkauXokFCdGWjpRzYqk+DoZhJGKG3aC90mY4vQS/lDEEJg MKQw/xyHTRbrCoYxlkj2r2pbG6Dvv7TqkGfBPkvGHVB6AXdvVSq8CsiC+W5UQ/AQm92p 14uhNaoWHNswwp0rHIjGKVBF/GT1+O8wzBvDN+G74l3XtFGCup62fZ7MsDpPA2/Y5E/f tLZqhzUWFHaJDrTo2NXZhta8hSNW3Zj8hgH5iUjwzcaA7sh0sUA5h8ZvYNAq1ux8lFWW GMPg== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=1OFhZYB7REGpAAmdzyA7otQ/hGEth32oUJ6nOIibRSY=; b=fhsReDVthpirwBmG704AbrKHLLiM/ImCiEKfFk6XOsYUIBcwJhELvfcfWyTxKyCFi5 d6RsSbtRIwSlSjPKxm62N2JcDDBBxAlsMe2BNiK+ayTsg8Pu+SK1WRcAEcYfWPtHdvS5 ooGNLH1WAtvSTk+gfdsvgVPSi4tUvHdfVGb7ysupfBWO6gNKXN962V8Iv8U1MmRHa5pq Dy4cFg7hwcI8jo0tn3kk7Yfa7qkp3IZsrq3k4RNmdABKzLV0wZPSCeNrlxsD9QVKHaPo Kg4jFqskhWYzkp6tohFUPC42vuBTX28APkFW2tQ68HOBSPPbJwn6Z4VZz+EkRkWd7wQ2 b02Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NDf7QpKn; 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 1si22969282eds.189.2019.07.31.13.53.02 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Jul 2019 13:53:02 -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=NDf7QpKn; 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 ([::1]:44518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsvan-00032H-S2 for patch@linaro.org; Wed, 31 Jul 2019 16:53:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33229) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsvNG-0005du-Fk for qemu-devel@nongnu.org; Wed, 31 Jul 2019 16:39:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsvNE-0003rp-Gl for qemu-devel@nongnu.org; Wed, 31 Jul 2019 16:39:02 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:37538) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hsvN8-0003oW-W5 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 16:38:58 -0400 Received: by mail-pf1-x443.google.com with SMTP id 19so32508020pfa.4 for ; Wed, 31 Jul 2019 13:38:54 -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 :mime-version:content-transfer-encoding; bh=1OFhZYB7REGpAAmdzyA7otQ/hGEth32oUJ6nOIibRSY=; b=NDf7QpKnwte7o2e/AQwdvefCheNM2JdcDcBOF3wBDKoSgnTGFpCO9saXeQGplF+LTO pQeKjSPhi4mSD/xCCu8EReRtXylQ4qDXgMtQ6/pFUUqkBxhBGT7FX0Ys7NVUU5Irf0vL OQpPbWODiN95XCblrujJIMXYzVhYePWixrN3JAsghy5vnHTnvu6u/bt/+K6dtQx6HlHI xYaL+1H47ngKC9c4g9inXLp+PCRlaxa06Sk4PZLMzKdYA4T8VBg59Ucq/e7F0gplKOhm IvoTDlFg56dZD93W0+jiPZa3X2p3XAYbozan0337sMlmGrQoIguBwzz8vNGHqBqoHe58 eO3A== 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:mime-version:content-transfer-encoding; bh=1OFhZYB7REGpAAmdzyA7otQ/hGEth32oUJ6nOIibRSY=; b=UmRqo/w/9hiqvmFdWQl4mkmhXSnEn4oc7DwtrFvMM9wa1XSSq/I8jSxZ/22yCWVA32 VSrSYtjooYQNsbJSzXYIgP8kj6ZR+EP8UsG4Jamg1qjxb5OG5EwDiKAWFX9eCFoDOOlP vlIevvwQlDVPH6bO+NjmjZa/C/p9qq/BIfPhfVD4GIAS5aBMHeIi1NRbR0n/lavx78mB JcwFzUaa5aKocG2pCMLhGnJQNALk8/ezIwZzPXQI5qr3oMt8Cy7G5EKllxK5s2J5Bwxr 4VVfLqv2qsJtHQly+x6jbXSpUhBqHbCEKAUA18J95hqIMxjVehgMEZ1eCr65NwPkh5xt zhvw== X-Gm-Message-State: APjAAAUp2ofG4qh52oyJMfn0MrsW9i96Bp+HCQEVUkM50icNWgW0XR1Q +An1cTtdg4JAeiARoIBVXZheiwvDi14= X-Received: by 2002:aa7:956d:: with SMTP id x13mr49793061pfq.132.1564605533112; Wed, 31 Jul 2019 13:38:53 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id g4sm84054164pfo.93.2019.07.31.13.38.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 13:38:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:38:12 -0700 Message-Id: <20190731203813.30765-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190731203813.30765-1-richard.henderson@linaro.org> References: <20190731203813.30765-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::443 Subject: [Qemu-devel] [PATCH v2 31/32] target/arm: check TGE and E2H flags for EL0 pauth traps X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée According to ARM ARM we should only trap from EL0 when TCG or E2H are 0. Signed-off-by: Alex Bennée Signed-off-by: Richard Henderson --- target/arm/pauth_helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c index 42c9141bb7..9fa002068e 100644 --- a/target/arm/pauth_helper.c +++ b/target/arm/pauth_helper.c @@ -371,7 +371,9 @@ static void pauth_check_trap(CPUARMState *env, int el, uintptr_t ra) if (el < 2 && arm_feature(env, ARM_FEATURE_EL2)) { uint64_t hcr = arm_hcr_el2_eff(env); bool trap = !(hcr & HCR_API); - /* FIXME: ARMv8.1-VHE: trap only applies to EL1&0 regime. */ + if (el < 1) { + trap &= !(hcr & HCR_TGE) | !(hcr & HCR_E2H); + } /* FIXME: ARMv8.3-NV: HCR_NV trap takes precedence for ERETA[AB]. */ if (trap) { pauth_trap(env, 2, ra);