From patchwork Fri Jan 18 14:57:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 155962 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3369856jaa; Fri, 18 Jan 2019 07:14:52 -0800 (PST) X-Google-Smtp-Source: ALg8bN6WF3LIm+z/KDPzFCH/teV5l/oi/4/vKAVVELQZqJAlOburtCzt7QrhSueyo3j/TpQZ/Pjm X-Received: by 2002:a5d:524b:: with SMTP id p11mr16197002wrv.147.1547824492715; Fri, 18 Jan 2019 07:14:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547824492; cv=none; d=google.com; s=arc-20160816; b=rM971q2mBKzzu37mvKswN26BlJ30OA+b/n9GWmQaJrgDkt+hyGg0WgyFTeElAYq+N2 uG54RztMQ1agI8oBMwGKeSL9A7ENRy29plEftbAJGE+SOzHJcbWS9Ism4oQ0Weg7MRk6 gpbIO0RNBmn4iqNsK3PyjDlisT0mE+H+EzmbJzVGNuisnUJCwYImO7ZvXIHiqNtVko7E +lTxAeI70koNj4ATcO/IGC5q23GdpWzdrme/TPFKNwDbtD3Hr9NkJx/LOyWOyimZT6ms d2xCGpnvPvcDOIQUw08kszzT2Jthvx9+PEXT9+VDUOaLTPlxVDr1vjhlSvTCIx0iszwE PH6Q== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=L5Aai9TuB4iwlPYGoRi+QAoiVjZbzBXAFroirCQzQpU=; b=cHvKBOyXUG2VmP6TwIpkSuhH4hpwLSYbSIkci3WHLNxLHW140ELvpraya8HXKwpMFQ YMjNh+sYCnE8b8XkOnon6PcwkayRAA1rPXIlrIWQFXNjtZ48G3k5vYi6+Uv+j5YBIZs6 eScCopIRGvEgMJj5zuDxxo5H7GAgOgLhYbbrIVPobkKRlLWVtA0JkmtiiBAv6hIn036Y dbXJmqfSTBmMkwB+n1pbzl3rAAFBfdIXwKzpLql67rw+Ll2DxlySeYrnaiKECO4jSFu1 MdYCSQ0sopKTxB/Bvd5XfFJRgdP/q3GeJ6EP8A7P10/+pzegksfjowRzYhNUNevKFYEq 8QiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ctsrcG1v; 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 h11si63307193wrw.18.2019.01.18.07.14.52 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 18 Jan 2019 07:14:52 -0800 (PST) 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=ctsrcG1v; 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 ([127.0.0.1]:41205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkVr9-0006qk-Ku for patch@linaro.org; Fri, 18 Jan 2019 10:14:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkVbY-0002ox-ST for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkVbW-0007Sd-43 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:44 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:50353) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkVbV-0007RO-QC for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:41 -0500 Received: by mail-wm1-x32b.google.com with SMTP id n190so4796664wmd.0 for ; Fri, 18 Jan 2019 06:58:41 -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:mime-version :content-transfer-encoding; bh=L5Aai9TuB4iwlPYGoRi+QAoiVjZbzBXAFroirCQzQpU=; b=ctsrcG1vetqU16OiLdlGdA4b+5cXAWan5ih5PPPrPxom+mHVjx+LVCbS0IlxvGuDHS tYZ63X8OwMFI8TEsqujfJQg7XtBeAZAoTR5NTn3ZlV1zLej9NxhDd7H+2ONP22niyVOM 4EOGygT8vk5VkPwZJpCdH5AoOYfOyNjhtFXbk= 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:mime-version:content-transfer-encoding; bh=L5Aai9TuB4iwlPYGoRi+QAoiVjZbzBXAFroirCQzQpU=; b=V48GuEJIezDzxKWTzCdDQNXg+ReiMbYryWRiLSUet1M4X3Q2tN0Vk58JWKgJsSxHJM Dus/KRLGppCjwSgOyIzzI2l/+P5GdSpaRO9KiJ9V8DHccW4rwAz3JdskiXfsVH64NXpA d+nAnxF67pXsNTw8gIe86HGltV6GYARW/zpz8P8BOInajuvs1CvhflHedyf+cYxTGMQv TWlFevB//tw0KaKXK33J4tvmw8Wp20Mj6iGD3fSLH0PMSpwTcXUauI55Nuf2UQxeTTb/ lnAcWfZEXt/977+iZtlTOqv7BMcgQqoPIPs39sHXhFwTVE2vZmFWAnmaIfHbLmLNztVX mAgA== X-Gm-Message-State: AJcUuke8/lmIC227ORzRelKT6zXXjgvov9+udeM3Lq4okgMca2skpaGS J4X3LYncFSZs4GmdYofKTNXF7l4yf6dVmA== X-Received: by 2002:a7b:cb0a:: with SMTP id u10mr14297805wmj.0.1547823520362; Fri, 18 Jan 2019 06:58:40 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e27sm92094561wra.67.2019.01.18.06.58.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 06:58:39 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 18 Jan 2019 14:57:45 +0000 Message-Id: <20190118145805.6852-30-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118145805.6852-1-peter.maydell@linaro.org> References: <20190118145805.6852-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b Subject: [Qemu-devel] [PULL 29/49] target/arm: Implement pauth_auth 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" From: Richard Henderson This is not really functional yet, because the crypto is not yet implemented. This, however follows the Auth pseudo function. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20190108223129.5570-26-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/pauth_helper.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c index e02376a2d02..fa7707e0bfc 100644 --- a/target/arm/pauth_helper.c +++ b/target/arm/pauth_helper.c @@ -50,7 +50,26 @@ static uint64_t pauth_original_ptr(uint64_t ptr, ARMVAParameters param) static uint64_t pauth_auth(CPUARMState *env, uint64_t ptr, uint64_t modifier, ARMPACKey *key, bool data, int keynumber) { - g_assert_not_reached(); /* FIXME */ + ARMMMUIdx mmu_idx = arm_stage1_mmu_idx(env); + ARMVAParameters param = aa64_va_parameters(env, ptr, mmu_idx, data); + int bot_bit, top_bit; + uint64_t pac, orig_ptr, test; + + orig_ptr = pauth_original_ptr(ptr, param); + pac = pauth_computepac(orig_ptr, modifier, *key); + bot_bit = 64 - param.tsz; + top_bit = 64 - 8 * param.tbi; + + test = (pac ^ ptr) & ~MAKE_64BIT_MASK(55, 1); + if (unlikely(extract64(test, bot_bit, top_bit - bot_bit))) { + int error_code = (keynumber << 1) | (keynumber ^ 1); + if (param.tbi) { + return deposit64(ptr, 53, 2, error_code); + } else { + return deposit64(ptr, 61, 2, error_code); + } + } + return orig_ptr; } static uint64_t pauth_strip(CPUARMState *env, uint64_t ptr, bool data)