From patchwork Fri Dec 14 05:24:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153758 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1679876ljp; Thu, 13 Dec 2018 21:39:35 -0800 (PST) X-Google-Smtp-Source: AFSGD/XyBAaSAgGW1vVnjAGM9nVOtygIvh2FfUcHlnE1sDcmgB5WT5GNZMx6z5bHznGI3t9Y2rh+ X-Received: by 2002:aed:20ca:: with SMTP id 68mr1520946qtb.296.1544765975249; Thu, 13 Dec 2018 21:39:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544765975; cv=none; d=google.com; s=arc-20160816; b=h0W5eVmUdCdvw/KjVyWcNHo/rGrL6P74bHpX/F8emdyNerjGZjDpgNwVj1xQake9ef pVbgRq/Q9gEfpGYDmmfKfXGydEJGrV4Tzg7kCAnV5wGsGSkGABCTVTV/jx8vhk0zovny HWuWCq0wqCQO4TwlDdtD6i0eayC9M+v2EYLSAvFgITQSRZbe/xh07cI1JB2FiuvHrcVu 2+kCJ98D2ckkYUX/jSQhL3k0uJu3k49fi1ebSKL0soqSk8CkTt/171Pxwe4UfXp2dzZI HARw3dad5/xb7eyXz9lT/IzwZR3iwiLEEWbCN94MAeH84G5ew/Ggs5r7UnqEn2ZhvWbG yikQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=LJHmvG46rKoYPUK7o3YkncppyaBFNTtglRYeWXkHhwE=; b=OoTCFZJcceUoXN4dCo2bpSxv8xTeccHlHv8N0JjRgBRFAR9DmDnK92jAxRTA5pRiaY QtLZ6pVJFy8EXl1QSXE4uwO3uIsHJiPw9VNWL/Frj0sZ7sGTQhmTnTynfpO7A5KcCArp si6q0vDGQQHfr+ah/swvWGwUBqlkwMDkZSlMCYF4iE7Q1sgqNylhYkqD8l/hdrsUKe+h 0vPe4lOa67bV0xDndoW+zl5eiskfU4t4yEk3Ii0dCb04R95l++SzgZqBkjTWrJ/bvkzS ma0yCHBgk3vWqpmZuBXX/CQLY7uQ27Lq+6KcL2EC8YF2rbWIr/eeL8KxBYxArSHqguMu qkkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NcqQ32aa; 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 d19si2315558qvd.218.2018.12.13.21.39.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 21:39:35 -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=NcqQ32aa; 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]:59502 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXgCE-0008Sk-MJ for patch@linaro.org; Fri, 14 Dec 2018 00:39:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXfxu-0004mX-5n for qemu-devel@nongnu.org; Fri, 14 Dec 2018 00:24:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXfxq-0005VI-Fj for qemu-devel@nongnu.org; Fri, 14 Dec 2018 00:24:46 -0500 Received: from mail-oi1-x241.google.com ([2607:f8b0:4864:20::241]:37727) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXfxq-0005UJ-72 for qemu-devel@nongnu.org; Fri, 14 Dec 2018 00:24:42 -0500 Received: by mail-oi1-x241.google.com with SMTP id y23so3631746oia.4 for ; Thu, 13 Dec 2018 21:24:41 -0800 (PST) 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; bh=LJHmvG46rKoYPUK7o3YkncppyaBFNTtglRYeWXkHhwE=; b=NcqQ32aa0v+N4T47hIQOshCk/LZqtikY4q30kCB89Wad6xqa63kg6/CBit19lHljKs W/FIkIV7WZsgv0pL8oCYwKl8e1eP9jIrGAqotz1+11l1z601fUlH0cO/1gmWWfijd98p yuEMd/OngbExtEwWG4AwjV0UInB5x1wjcCb0U= 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; bh=LJHmvG46rKoYPUK7o3YkncppyaBFNTtglRYeWXkHhwE=; b=jN0dX/rxmkIWAc9UqSgE0biFNRDgNd+25Az4R5SOgyYVgH96qsg4KgjLnJFUfUZxPp KCpVcu4QwnBjzz+qSeACM5c+OmpFROEg6kac0jj8PztFaXaWuOk5wTqL09FQzqg9iK+H 9gn1RtpaVv+3UNtPDL8KXYKFDxw0tjir6JydClDye54osCezx0pKZwM6PmAUeeq+ddxE gLdsUUg39Rw822A9CEr0GmJgWiYfpvnB3C74A9LoNw2+8/Ti87Kdb2ivx351Xdp1D+b0 hcUhsjG+hQxNORfHJDHejQeXuNSE+VllAnPk8v46qgbrIDOiXmoqV2Ecrve8mojpvhTg LyPg== X-Gm-Message-State: AA+aEWYcGDGy4ccbriJGlReeJjD/Tq1gRjiaO8Ygcq+KOV+/O25Rw2h2 Rp9UOFSvNVzkPEUoXvqc1F/rjAu7NGThtQ== X-Received: by 2002:aca:bd41:: with SMTP id n62mr1013088oif.348.1544765080162; Thu, 13 Dec 2018 21:24:40 -0800 (PST) Received: from cloudburst.twiddle.net ([187.217.227.243]) by smtp.gmail.com with ESMTPSA id r1sm1845379oti.44.2018.12.13.21.24.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Dec 2018 21:24:39 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 23:24:07 -0600 Message-Id: <20181214052410.11863-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181214052410.11863-1-richard.henderson@linaro.org> References: <20181214052410.11863-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::241 Subject: [Qemu-devel] [PATCH v2 24/27] target/arm: Add PAuth system registers 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/helper.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) -- 2.17.2 Reviewed-by: Peter Maydell diff --git a/target/arm/helper.c b/target/arm/helper.c index b9ffc07fbc..f1e9254c9a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5061,6 +5061,70 @@ static CPAccessResult access_lor_other(CPUARMState *env, return access_lor_ns(env); } +#ifdef TARGET_AARCH64 +static CPAccessResult access_pauth(CPUARMState *env, const ARMCPRegInfo *ri, + bool isread) +{ + int el = arm_current_el(env); + + if (el < 2 && + arm_feature(env, ARM_FEATURE_EL2) && + !(arm_hcr_el2_eff(env) & HCR_APK)) { + return CP_ACCESS_TRAP_EL2; + } + if (el < 3 && + arm_feature(env, ARM_FEATURE_EL3) && + !(env->cp15.scr_el3 & SCR_APK)) { + return CP_ACCESS_TRAP_EL3; + } + return CP_ACCESS_OK; +} + +static const ARMCPRegInfo pauth_reginfo[] = { + { .name = "APDAKEYLOW_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 2, .opc2 = 0, + .access = PL1_RW, .accessfn = access_pauth, + .fieldoffset = offsetof(CPUARMState, apda_key.lo) }, + { .name = "APDAKEYHI_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 2, .opc2 = 1, + .access = PL1_RW, .accessfn = access_pauth, + .fieldoffset = offsetof(CPUARMState, apda_key.hi) }, + { .name = "APDBKEYLOW_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 2, .opc2 = 2, + .access = PL1_RW, .accessfn = access_pauth, + .fieldoffset = offsetof(CPUARMState, apdb_key.lo) }, + { .name = "APDBKEYHI_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 2, .opc2 = 3, + .access = PL1_RW, .accessfn = access_pauth, + .fieldoffset = offsetof(CPUARMState, apdb_key.hi) }, + { .name = "APGAKEYLOW_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 3, .opc2 = 0, + .access = PL1_RW, .accessfn = access_pauth, + .fieldoffset = offsetof(CPUARMState, apia_key.lo) }, + { .name = "APGAKEYHI_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 3, .opc2 = 1, + .access = PL1_RW, .accessfn = access_pauth, + .fieldoffset = offsetof(CPUARMState, apia_key.hi) }, + { .name = "APIAKEYLOW_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 1, .opc2 = 0, + .access = PL1_RW, .accessfn = access_pauth, + .fieldoffset = offsetof(CPUARMState, apia_key.lo) }, + { .name = "APIAKEYHI_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 1, .opc2 = 1, + .access = PL1_RW, .accessfn = access_pauth, + .fieldoffset = offsetof(CPUARMState, apia_key.hi) }, + { .name = "APIBKEYLOW_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 1, .opc2 = 2, + .access = PL1_RW, .accessfn = access_pauth, + .fieldoffset = offsetof(CPUARMState, apib_key.lo) }, + { .name = "APIBKEYHI_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 1, .opc2 = 3, + .access = PL1_RW, .accessfn = access_pauth, + .fieldoffset = offsetof(CPUARMState, apib_key.hi) }, + REGINFO_SENTINEL +}; +#endif + void register_cp_regs_for_features(ARMCPU *cpu) { /* Register all the coprocessor registers based on feature bits */ @@ -5845,6 +5909,12 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_one_arm_cp_reg(cpu, &zcr_el3_reginfo); } } + +#ifdef TARGET_AARCH64 + if (cpu_isar_feature(aa64_pauth, cpu)) { + define_arm_cp_regs(cpu, pauth_reginfo); + } +#endif } void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)