From patchwork Mon Mar 6 15:34:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 659242 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1899021wrb; Mon, 6 Mar 2023 08:13:58 -0800 (PST) X-Google-Smtp-Source: AK7set/0tNBioNBuCmZDUWBCiRLHikyVzpTTnHaynR4vAJEqcOz7kg/Oev4ysN7FcXk2d76eK+DD X-Received: by 2002:ac8:5fca:0:b0:3ba:1113:751a with SMTP id k10-20020ac85fca000000b003ba1113751amr19325683qta.67.1678119238736; Mon, 06 Mar 2023 08:13:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678119238; cv=none; d=google.com; s=arc-20160816; b=D887gzrZsGZyYv9riPTauY2TDDTHOuyy75kHRfrOz5mWy/+hgD8RSaQr1qFVu7oWpx dcQ7Qvj97ySYR5RVpabrGxVd4ap4IptK2MULZ4ZJO3kvlNQzaPrXmf9H1gHH5X7GCZ8+ f5SdZWMQtq6MCpPslfZ6etEQPKkGyMV7VbNh1vStK8WiWtFvBahIapLyIsXcmv+Bvsve kUAaeGx/uFOUAAz3lfhQSeo4niQusXGkVxjR+usn2WQ/7arq398T3ps36PZha9QYS5kX pVoxyh8XFcFVUagS83mUxVhXqcLJjTUyw1F0gVFSXy6/E86UgPLunV7kpihPF6w9Gwwx WOjw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=n3nNUjZBhON55v351EAFbDNEjPLJymf5+GUgr1/Qymw=; b=tQzLOyt2eVRNlXYPVpx3BzEZNqEJhBse1NB21RA987lUm8TeGaoSRYBioyznRaC3Sf wkZu0IWPthk0y7aZ89uwm4ZhwOCr8d7e0Nq9eT1pdjKE8CNvCZ4e/fpBuVp4B7JVz2Ej ihItGLRrPTbd4XxPhRR737HjtLO1SbatfkHx2FjuNp8lQ8kSWKlyk0mcm0XoYGgKqAFp B6wN1Nxz8dRxAIN6Y0vdcHOcjA/OzQ/f+T2kuRtIv8lLkbUUz7eYBT1ySnLja6FW/Qoy fWDMw398XDGk4JiRr2yLsuVahAc0RlGejagNNsXps9iCBqDLcvtFDuZMBnxvCHAZagWc HHSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aYAg5obJ; 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=pass (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 d20-20020ac85d94000000b003bd06c84109si7724864qtx.715.2023.03.06.08.13.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Mar 2023 08:13:58 -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=pass header.i=@linaro.org header.s=google header.b=aYAg5obJ; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZCrT-00045D-9G; Mon, 06 Mar 2023 10:34:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZCrQ-00043S-DC for qemu-devel@nongnu.org; Mon, 06 Mar 2023 10:34:48 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZCrO-00029y-Kh for qemu-devel@nongnu.org; Mon, 06 Mar 2023 10:34:48 -0500 Received: by mail-wr1-x42c.google.com with SMTP id h11so9258499wrm.5 for ; Mon, 06 Mar 2023 07:34:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678116885; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=n3nNUjZBhON55v351EAFbDNEjPLJymf5+GUgr1/Qymw=; b=aYAg5obJhI8y9PrLC7CL0XW5lLkP8E8jSM+gK+VEZEVOjdT9D60a8CnkQdS/73Gs/8 4eib76uVstmW4KXf69WtHV+hc+E9k5ft86Qnape5VvYZ7lmol8a+1YZgykaCjRR1c7Bt 1CTbOrn+S+gbvENcSukKAy0l/pq2JHRBHy0GKMsC/UDRxNdEzRzx+NGPwj2bVd53pDPf fdlRUbb70Jnti6oHMOUT9CL/jZrhngvktAXkxmjrUhUlLiHUztnGJTceGUXCR5K8lcQz 2BTpLgmG8X3lfLZrLDwudBiIWNhurhCPChCxRtzFnZfG3OXC6hkVJJvGXUH1iWWUqqC7 xwdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678116885; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n3nNUjZBhON55v351EAFbDNEjPLJymf5+GUgr1/Qymw=; b=2cEIvqqMXwCRo57489ujTJlJdyqJqGXnXKqlHIHVNAGHDS+M4O7Y5yw8xPqoNZ4SY+ 6X8wt+ELXIsCkW+z4mO4O8J7rG1RdwlhZu8EtkbDls749WCTWsLyUsKu7/kMf91p+50X jIeek0LrFQ02iwQV0L5z4pRgva9YXmJ8bbZpPXZkpWeCq9ch0L94o/GY8zGlZdWJmiXU bgTP4mpUV5EH3xn+UgSwQgHRHDBABaNwIN55aeBdrinXHB58l5E9HNQFJfdhuzBVM3fI zCtxHxsOvpufbaMIpXPd6gE5JBezcMOex6xS1+3k4K88IpLo87A3S2dwppk7WiKSR6yx CGXg== X-Gm-Message-State: AO0yUKUsB4WAWrRWVcD7Cs5ApscscceObjAcoR2k/VZd3JDoWvX0Hv9i Qfh5kzSwsKGDCo60PNybrQNL310qp8msGDzFp8U= X-Received: by 2002:a5d:4dc5:0:b0:2c5:55cf:b1ab with SMTP id f5-20020a5d4dc5000000b002c555cfb1abmr5985682wru.48.1678116885353; Mon, 06 Mar 2023 07:34:45 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v7-20020a05600c444700b003eb0d6f48f3sm15287432wmn.27.2023.03.06.07.34.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 07:34:44 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 10/21] target/arm: Create pauth_ptr_mask Date: Mon, 6 Mar 2023 15:34:24 +0000 Message-Id: <20230306153435.490894-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306153435.490894-1-peter.maydell@linaro.org> References: <20230306153435.490894-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Keep the logic for pauth within pauth_helper.c, and expose a helper function for use with the gdbstub pac extension. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20230227213329.793795-11-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/internals.h | 10 ++++++++++ target/arm/tcg/pauth_helper.c | 26 ++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 15988768be3..c891c7a3831 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1368,6 +1368,16 @@ int exception_target_el(CPUARMState *env); bool arm_singlestep_active(CPUARMState *env); bool arm_generate_debug_exceptions(CPUARMState *env); +/** + * pauth_ptr_mask: + * @env: cpu context + * @ptr: selects between TTBR0 and TTBR1 + * @data: selects between TBI and TBID + * + * Return a mask of the bits of @ptr that contain the authentication code. + */ +uint64_t pauth_ptr_mask(CPUARMState *env, uint64_t ptr, bool data); + /* Add the cpreg definitions for debug related system registers */ void define_debug_regs(ARMCPU *cpu); diff --git a/target/arm/tcg/pauth_helper.c b/target/arm/tcg/pauth_helper.c index d0483bf051e..20f347332dc 100644 --- a/target/arm/tcg/pauth_helper.c +++ b/target/arm/tcg/pauth_helper.c @@ -339,14 +339,32 @@ static uint64_t pauth_addpac(CPUARMState *env, uint64_t ptr, uint64_t modifier, return pac | ext | ptr; } -static uint64_t pauth_original_ptr(uint64_t ptr, ARMVAParameters param) +static uint64_t pauth_ptr_mask_internal(ARMVAParameters param) { - /* Note that bit 55 is used whether or not the regime has 2 ranges. */ - uint64_t extfield = sextract64(ptr, 55, 1); int bot_pac_bit = 64 - param.tsz; int top_pac_bit = 64 - 8 * param.tbi; - return deposit64(ptr, bot_pac_bit, top_pac_bit - bot_pac_bit, extfield); + return MAKE_64BIT_MASK(bot_pac_bit, top_pac_bit - bot_pac_bit); +} + +static uint64_t pauth_original_ptr(uint64_t ptr, ARMVAParameters param) +{ + uint64_t mask = pauth_ptr_mask_internal(param); + + /* Note that bit 55 is used whether or not the regime has 2 ranges. */ + if (extract64(ptr, 55, 1)) { + return ptr | mask; + } else { + return ptr & ~mask; + } +} + +uint64_t pauth_ptr_mask(CPUARMState *env, uint64_t ptr, bool data) +{ + ARMMMUIdx mmu_idx = arm_stage1_mmu_idx(env); + ARMVAParameters param = aa64_va_parameters(env, ptr, mmu_idx, data); + + return pauth_ptr_mask_internal(param); } static uint64_t pauth_auth(CPUARMState *env, uint64_t ptr, uint64_t modifier,