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 7DBB2C46CA2 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=AyaKOiRQyrvPZZwIcBR7GQ0/Qerg6JZLqtUlMKBC3T0=; b=IEXRzEnhF6UadABjotFCKZRwLr fclCY/rXU0yiZsD+3pUkmxcEICK/0rI6RtvWMQ8BwCyfjHmIwR4xku9PZaoWAlSL3TFAeNu0/FkQz x1O6sNQrlAH5wYy2yIGu2Veu1xs965Uknknk3XRPNccHfLGT9OgQ2mNtHQdJb4kewpS+lQPv48fLx 9Sv7ZdnHNrU5KtRMwuuZJms6+DtlpMMk3XIByv1sW5OY88Lv2bmON2QeiQXJhLUkqtJVhuTQrOF6q E8LuK7Z3Lo8wbd7W/koKVU3TFmbRLlV/b5/cyLh99iz5pIJRVKu9JURhHPf2B0c3d2GCI595GiDOQ ODF4ldWw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDjhm-0000Pr-0R; Thu, 14 Dec 2023 11:16:38 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDiY7-00HP2y-19 for linux-arm-kernel@lists.infradead.org; Thu, 14 Dec 2023 10:02:36 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-dbcd721b366so346767276.0 for ; Thu, 14 Dec 2023 02:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702548154; x=1703152954; 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=S1+IuL8DTNb6t5XDOnXjUzV0e48iypX1iDtmuw3RN+0=; b=WzI80vpVjLuGf9QJMrkuXjGj7nkKiy/dl1uT7MKdUx7WNUZBb/heZZl+5O+zmfFcg2 tnhb0P7LC0asQ7XrYeiz4nCpYPQrEBvSkFUew60QOJFeMtjp4BNd1/cdTim2oRUT7mDx UYBobAKq9SckqPzRq3U6wVUbcHQX+Lna0Ux21R6nTOSMweNliBqimurKcZ83l/DPqGe7 +Xlyrn8CF5/VoXW9AiW7jpxW4A5Lr7r41wLFLWDrO6dY/e3BJ/RPAGMW3MhadoviMQMc UUrHDOtX9pqHULxWTXNLJsFg43nTOj2ofkAnYbk761tagzQ1n6f8jxRR088ZhJ4n12FJ IHCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702548154; x=1703152954; 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=S1+IuL8DTNb6t5XDOnXjUzV0e48iypX1iDtmuw3RN+0=; b=Aqmy2T8tKV7E1YoCXKCu+maSqdzB6DC2Y0P590g6fWP/74tFREuQ3sck55TJIIyPT0 pHccBwar/rsYXTvIZl+EOQ2dxjg7qPbI0S6pcDumPgMb6NzRR8BXBfTfBBEFymN/zcRi jfYS3r2S7B9qbqd5wACI0zRCPhRoqwQFCkxn0K7Bo9glQr6i3HJnXnwwkN9sk4Tvim02 hrD/5TRT3KiyxdvTEch90lLm8QU5XWwQ5nQ3rbCQy2Zi4VgDyTbCskhOHgDCheJcNPsJ 63CN10ZaSM/NRQyNybpd0ZyvyW38PW5A/i9FEHZD2/yq3DbGKF1Zllfdg7yj6E4tNrzL 60Kg== X-Gm-Message-State: AOJu0YxZTnR2zFYJylTMMfkB2DG+/t5cG/P4Iqy9E14ca8zQWwClOHkD OunZjgQB2Y2ymEuCq7X5anmmsKB+bg== X-Google-Smtp-Source: AGHT+IFYC31qCWJ06bIumj+WQ40j9UIE6wLj/c88RXH+XdggRYNwnvugeJ9GwrMi29Nj5+bhLHACVDAgRw== X-Received: from fuad.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1613]) (user=tabba job=sendgmr) by 2002:a25:1307:0:b0:db5:4a00:a153 with SMTP id 7-20020a251307000000b00db54a00a153mr159337ybt.4.1702548153946; Thu, 14 Dec 2023 02:02:33 -0800 (PST) Date: Thu, 14 Dec 2023 10:01:55 +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-16-tabba@google.com> Subject: [PATCH v3 15/17] KVM: arm64: Fix which features are marked as allowed 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_020235_404792_D7CFAEBE X-CRM114-Status: GOOD ( 10.38 ) 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 Cache maintenance operations are not trapped for protected VMs, and shouldn't be. Mark them as allowed. Moreover, features advertised by ID_AA64PFR2 and ID_AA64MMFR3 are (already) not allowed, mark them as such. Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h b/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h index e91922daa8ca..8d97dff4bb7b 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h +++ b/arch/arm64/kvm/hyp/include/nvhe/fixed_config.h @@ -69,6 +69,8 @@ ARM64_FEATURE_MASK(ID_AA64PFR1_EL1_SSBS) \ ) +#define PVM_ID_AA64PFR2_ALLOW 0ULL + /* * Allow for protected VMs: * - Mixed-endian @@ -101,6 +103,7 @@ * - Privileged Access Never * - SError interrupt exceptions from speculative reads * - Enhanced Translation Synchronization + * - Control for cache maintenance permission */ #define PVM_ID_AA64MMFR1_ALLOW (\ ARM64_FEATURE_MASK(ID_AA64MMFR1_EL1_HAFDBS) | \ @@ -108,7 +111,8 @@ ARM64_FEATURE_MASK(ID_AA64MMFR1_EL1_HPDS) | \ ARM64_FEATURE_MASK(ID_AA64MMFR1_EL1_PAN) | \ ARM64_FEATURE_MASK(ID_AA64MMFR1_EL1_SpecSEI) | \ - ARM64_FEATURE_MASK(ID_AA64MMFR1_EL1_ETS) \ + ARM64_FEATURE_MASK(ID_AA64MMFR1_EL1_ETS) | \ + ARM64_FEATURE_MASK(ID_AA64MMFR1_EL1_CMOW) \ ) /* @@ -133,6 +137,8 @@ ARM64_FEATURE_MASK(ID_AA64MMFR2_EL1_E0PD) \ ) +#define PVM_ID_AA64MMFR3_ALLOW (0ULL) + /* * No support for Scalable Vectors for protected VMs: * Requires additional support from KVM, e.g., context-switching and -- 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