From nobody Wed Feb 11 02:12:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1676392327; cv=none; d=zohomail.com; s=zohoarc; b=bUzTLFLFd9f8b79Qh7tpv4BrfLBkZQaZYcyLEQQ+5F0bCUI8PQjZz/YXdEr5rDjt/Os/DI//7Jyl1xoUCud86ZFQl1unvMEM6zzDHFBdPrL90a+zc4sZEZAUN2Ai1imLaTAuaCa6uExZre1cCBUlFRRAKkdlRjHjlnAYBsgfHbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676392327; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O4L2aD/rteJmwpjNgOeST3MFgjCAfq0kho6AOw6LVxY=; b=ds52TD5MCWxpUcVpxWFwSfSWBE8uGuUxsrI/YDMeJhnaCtKb4mukK5f47Xw9YSAQ6Vcg9LWPWEiNe5geQw1fJOUY4adjGi5I0WL7rf689zwMpma4YgvTEegLQiTgZQQn88pTDfuwO/dpuFWgw8Gxg6CdpRfgVer4ZBEtjlNr8/0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1676392327059490.10174640671266; Tue, 14 Feb 2023 08:32:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRyD3-0006f0-E4; Tue, 14 Feb 2023 11:31:13 -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 1pRyCz-0006Xz-S2 for qemu-devel@nongnu.org; Tue, 14 Feb 2023 11:31:09 -0500 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRyCy-0002At-4n for qemu-devel@nongnu.org; Tue, 14 Feb 2023 11:31:09 -0500 Received: by mail-pf1-x42f.google.com with SMTP id r3so5117261pfh.4 for ; Tue, 14 Feb 2023 08:31:07 -0800 (PST) Received: from stoup.. (rrcs-74-87-59-234.west.biz.rr.com. [74.87.59.234]) by smtp.gmail.com with ESMTPSA id d17-20020aa78691000000b0058d99337381sm10337011pfo.172.2023.02.14.08.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 08:31:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O4L2aD/rteJmwpjNgOeST3MFgjCAfq0kho6AOw6LVxY=; b=FNOu001baRn9xqSHxQFP4GwVirZu96YX/ixq4QQuhAVb/JhOJDPCkEwRsmgNneYlYn 0Yz9z8+etztjbDdKfEUfVraiWaSdki9nTnSDNUocFQjJltWPS9h/QO14unh2JGD4791H Mibh7RWSjcBI3nsdBDJyaYh6ZiBl05PXoIhh3xvNoteYtR1A9Ecmo+ws1mP4MpwwZmca 5XAEb6tEpXkAF57FlBiFTAdx23xsUKameIrRgLhS/SYJVvd6pUikQ1fKmIsc0t4mww5B ANE+vRDrVM21SRy3hG3/p2vJTtAtsIJRLMTv7cWIFzO43Q5SPOFR9HQtF1deTs629CO7 iWJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O4L2aD/rteJmwpjNgOeST3MFgjCAfq0kho6AOw6LVxY=; b=qXFKIIMjy5Coquw+f0R+Np2UduRrLPWu/vtEbDJTorfeW5imq1VjEAMOnC6LXZqQQI 7A8SoB53Glo1MouIObMxJw3D5j30Iw+gzTh4ClbCFSRA0ERMpUACoQpBa2+sV4/8wq2U Cgpq+VXU+rrrrgs7egwoKl17HJJs4kK1XNwtX6/J3E7857wxrVCZ7dbo+N12HhdYrUiz SfjFAEIlbfyStqTWAJHYYpixU94+wsqe8DoHRmS3zW+cwhSZEI1AhvJLQoX4b+JLaNSw npZi2dumpFsJCaQG537F98tqA0dvmk558t6p9wu6KaKXqx8UPYaKbIlhgOvQYv2JNZdx 5Mdg== X-Gm-Message-State: AO0yUKUrLqWD6BCrfvReqOVz5XxmzBA/4bWOGsyM91qWV5DGDujWnjhM EazD+g+70nEc5to/BbZRzLi1CphB1Lj6uJTQWAI= X-Google-Smtp-Source: AK7set8UxuVZNaGvI2w1yrJ9ORg0TJYPd4DOh5FoaKX7jJE2UFc5zBYgspva1RWSkUIodFCk5MswGw== X-Received: by 2002:a62:5b86:0:b0:5a8:5246:73eb with SMTP id p128-20020a625b86000000b005a8524673ebmr2621766pfb.33.1676392266680; Tue, 14 Feb 2023 08:31:06 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 10/14] target/arm: Create pauth_ptr_mask Date: Tue, 14 Feb 2023 06:30:44 -1000 Message-Id: <20230214163048.903964-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230214163048.903964-1-richard.henderson@linaro.org> References: <20230214163048.903964-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1676392327664100001 Content-Type: text/plain; charset="utf-8" Keep the logic for pauth within pauth_helper.c, and expose a helper function for use with the gdbstub pac extension. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/internals.h | 10 ++++++++++ target/arm/pauth_helper.c | 26 ++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index c98482561e..bb3983645d 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1364,6 +1364,16 @@ int exception_target_el(CPUARMState *env); bool arm_singlestep_active(CPUARMState *env); bool arm_generate_debug_exceptions(CPUARMState *env); =20 +/** + * 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); =20 diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c index d0483bf051..20f347332d 100644 --- a/target/arm/pauth_helper.c +++ b/target/arm/pauth_helper.c @@ -339,14 +339,32 @@ static uint64_t pauth_addpac(CPUARMState *env, uint64= _t ptr, uint64_t modifier, return pac | ext | ptr; } =20 -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 =3D sextract64(ptr, 55, 1); int bot_pac_bit =3D 64 - param.tsz; int top_pac_bit =3D 64 - 8 * param.tbi; =20 - 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 =3D 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 =3D arm_stage1_mmu_idx(env); + ARMVAParameters param =3D aa64_va_parameters(env, ptr, mmu_idx, data); + + return pauth_ptr_mask_internal(param); } =20 static uint64_t pauth_auth(CPUARMState *env, uint64_t ptr, uint64_t modifi= er, --=20 2.34.1