From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A4B09C41535 for ; Thu, 14 Dec 2023 11:17:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=LfDG+/OI4T7UGtBOPD1DAxI0djJ7SMuz2kAg9wy+5g4=; b=U+kZQ8jtJXNLsNy+uYV9CuLojC gpyecvKQpx4/dOPMmj78XBxkp08iHkcpkTE6OSt782VVNZzlW+KPSRUQGW/qFX+4AdX4MAdDLHdJs 2qenxRSGKwrGe00FL7hUTyIs8w1hdgIDmY8hZPmDnl3F/XJvaq6dr88cwe9Ux8VZwp5r5Fv2xV2E+ BJnR3JE3MJt0VCpwK4gDWU9Z8Jz/w/f4pQWksEz9NbcSGNT6ETNqb3HYXWQBU8RcFd4KRwUpZadIH HOUzKcFviBACmZ/NMqhyFisfudTnd+NNAHhB4/xr05l61TZ+yBBEY2gPEgUMspiSkdcMmCdHhs5R4 zjDGw7yw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDjhm-0000QJ-2D; Thu, 14 Dec 2023 11:16:38 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDiYA-00HP4j-1b for linux-arm-kernel@lists.infradead.org; Thu, 14 Dec 2023 10:02:42 +0000 Received: by mail-wr1-x44a.google.com with SMTP id ffacd0b85a97d-33608afc552so6002745f8f.2 for ; Thu, 14 Dec 2023 02:02:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702548156; x=1703152956; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=DxM0XHeehpr+WPJP1Pzkg4drlsNFy3fN21V8Kb3LPPA=; b=GIWYgKTFObDRP+haHFnBKRt1QkWofRxM+5S7fke/TfGK6d41MVtYn3wrKb4TEeFxUa mrGamTxgGyGfs1BBlIvWUDs7kDzGRzmkKl3UeOGl0aW4iQkNeGm5t/IHyv6++PETLDh/ ldfsnWTuXNdX+FSAUXopgwVImxdxk/HLnC45CjUTci1lBm5dqcErByKm01yxeMMR7UXL k0yJjHRU9ybgvbh18MTUvUtYU6JyQOxqDuN9x+OiXS/2GI3txSXBaQm4Ezw8Mc3XQkbt ccPUSx4Xw6ATEUiavyHAmdjgA9LNHmJnI/Ss3ijmj7d5y73LFxch11QGsZEP4hfkD/wC Agmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702548156; x=1703152956; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DxM0XHeehpr+WPJP1Pzkg4drlsNFy3fN21V8Kb3LPPA=; b=kMTHcSoprsvb9upqWSUrAmrI3DsOwYKSwUn/OeyK4Q7elfnajP5hMaXMeBmS3QJXP9 l06RMBKUqN0IGryoTzcxav9mpkRxkZ0T7+oHalm95RsGkFFfyKCA+OC8wT8EglwyCsf5 XBmrjwZ28ImrZTczGzPPs9eqB2JntscpTUgziDsXJCo49J0mHuu4Pa8nVsM/cfHAN0eH GvEQRUGJpnNIuLlI2zMk/Uv+vjUNZTZPlEpn/2AlMEY65MpMybIBwifM5Mj47wD6YJ4e lTUM3lobl6rSOY0I2CbZqAgr2xLDUw6bOnvROA+dAvSywgwx5fW+kWFPnh4/GkUAUI7e KbFw== X-Gm-Message-State: AOJu0Yy84xzl0zM0RvKOR7zGGj09HM7HzRwaTxJUJD4QSiUVCqPXDKJd TFr5Dp89jIyl2BLncpp5HcGlLNBo+A== X-Google-Smtp-Source: AGHT+IHRZfkX+kRwxAcAgeOYuqBVIq7qh6v7y8TD4vtcPCdnrGYYlwGO4zqQN1aoI/8Pp/ExfSE/vt6lxQ== X-Received: from fuad.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1613]) (user=tabba job=sendgmr) by 2002:a5d:4b06:0:b0:336:4a97:9f70 with SMTP id v6-20020a5d4b06000000b003364a979f70mr1374wrq.5.1702548156209; Thu, 14 Dec 2023 02:02:36 -0800 (PST) Date: Thu, 14 Dec 2023 10:01:56 +0000 In-Reply-To: <20231214100158.2305400-1-tabba@google.com> Mime-Version: 1.0 References: <20231214100158.2305400-1-tabba@google.com> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20231214100158.2305400-17-tabba@google.com> Subject: [PATCH v3 16/17] KVM: arm64: Mark PAuth as a restricted feature for protected VMs From: Fuad Tabba To: kvmarm@lists.linux.dev Cc: maz@kernel.org, oliver.upton@linux.dev, broonie@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, eric.auger@redhat.com, jingzhangos@google.com, joey.gouly@arm.com, tabba@google.com, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231214_020238_557317_E5EF2D12 X-CRM114-Status: UNSURE ( 9.74 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Protected VMs will only support basic PAuth (FEAT_PAuth). Mark it as restricted to ensure that later versions aren't supported for protected guests. Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h b/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h index 8d97dff4bb7b..51f043649146 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h +++ b/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h @@ -184,10 +184,18 @@ ARM64_FEATURE_MASK(ID_AA64ISAR0_EL1_RNDR) \ ) +/* Restrict pointer authentication to the basic version. */ +#define PVM_ID_AA64ISAR1_RESTRICT_UNSIGNED (\ + FIELD_PREP(ARM64_FEATURE_MASK(ID_AA64ISAR1_EL1_APA), ID_AA64ISAR1_EL1_APA_PAuth) | \ + FIELD_PREP(ARM64_FEATURE_MASK(ID_AA64ISAR1_EL1_API), ID_AA64ISAR1_EL1_API_PAuth) \ + ) + +#define PVM_ID_AA64ISAR2_RESTRICT_UNSIGNED (\ + FIELD_PREP(ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_APA3), ID_AA64ISAR2_EL1_APA3_PAuth) \ + ) + #define PVM_ID_AA64ISAR1_ALLOW (\ ARM64_FEATURE_MASK(ID_AA64ISAR1_EL1_DPB) | \ - ARM64_FEATURE_MASK(ID_AA64ISAR1_EL1_APA) | \ - ARM64_FEATURE_MASK(ID_AA64ISAR1_EL1_API) | \ ARM64_FEATURE_MASK(ID_AA64ISAR1_EL1_JSCVT) | \ ARM64_FEATURE_MASK(ID_AA64ISAR1_EL1_FCMA) | \ ARM64_FEATURE_MASK(ID_AA64ISAR1_EL1_LRCPC) | \ @@ -202,8 +210,8 @@ ) #define PVM_ID_AA64ISAR2_ALLOW (\ + ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_ATS1A)| \ ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_GPA3) | \ - ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_APA3) | \ ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_MOPS) \ ) -- 2.43.0.472.g3155946c3a-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel