From patchwork Thu Feb 16 16:00:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristina Martsenko X-Patchwork-Id: 58156 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp383044wrn; Thu, 16 Feb 2023 08:05:22 -0800 (PST) X-Google-Smtp-Source: AK7set+zxKeoLTDdsMxR/hBGmMlGCpAiMvAKSFSKf1rUVYWc3FXUEbxtkdskiEWy0oPz48k9Sr/8 X-Received: by 2002:a17:906:8306:b0:8b1:1f2d:ecf1 with SMTP id j6-20020a170906830600b008b11f2decf1mr7008357ejx.67.1676563522490; Thu, 16 Feb 2023 08:05:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676563522; cv=none; d=google.com; s=arc-20160816; b=FPxALivGdjMrqo49bqv/DXOx7FhZh/KNlxblNPj68vj0bOjyP6brqt5I4zig+L4dlr l9ulPexOqT97hVuEHywOgrVEQAgBPGeY1BxSp27Sr5X0772QQGnQsE3IXoUjjQJZdUYJ Nsu9mM994C+WAvUAd6Dq1Zqh8tAWRVpD+0rkVyaS3NzXBi8qTzAEtouz+1i8I2bMcikj cJsQMmiEDiVNGxWPXrBELV3GPbp5oUJ41DcPuPwgbMFVjZKiOzgC5pK4K7F+j/Zc5I7F JNAnODGNDSqukT6xWf9uWCNXytWWwD/DS0ervB7w/KH6puDhWlROY5Vkc+I/uILzRefQ +Vzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=hlcDx/UTKs2e1olbAGvC+CALi/yHG38ejl0YWhaliz8=; b=CylkuDBHHz01sSEkbo9n78RYdEz41baOMWMQU0JsPU7JanXAK/zx44JyohPvMr9B0H f3DjFW/Ie/QWXnwaB6Y+Xi9R6be6M/pgwuukI8nqA9kB8r8TXPFKtVl/EYH6ZXAv84TV 26lY5VtWrJ+a6MQWGzB48VNC0EFN+qXU1FJcrTKh8fjDfzb1tN3oCcdWWOtgZYqoRPFS zEVDB/6Ub1o4QVH/Kq4CNfk4CvKEdluCguBlL+Tu34nAC/9sbmprPxnP9BEfNDCwwHUy GtmzBra4VrMdU6jKiV4QogGciLEnTNfvpz1p1pepLPMQ1QWqmusx4IM8vAoTXlzXzkv9 4Now== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id eq23-20020a170907291700b008b123cf1570si1747540ejc.243.2023.02.16.08.04.58; Thu, 16 Feb 2023 08:05:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229608AbjBPQCE (ORCPT + 99 others); Thu, 16 Feb 2023 11:02:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229658AbjBPQBy (ORCPT ); Thu, 16 Feb 2023 11:01:54 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9A4B9564B7 for ; Thu, 16 Feb 2023 08:01:50 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0DD0A1042; Thu, 16 Feb 2023 08:02:33 -0800 (PST) Received: from e126864.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6E66D3F881; Thu, 16 Feb 2023 08:01:47 -0800 (PST) From: Kristina Martsenko To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev Cc: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Mark Rutland , Mark Brown , Luis Machado , Vladimir Murzin , linux-kernel@vger.kernel.org Subject: [PATCH 06/10] KVM: arm64: hide MOPS from guests Date: Thu, 16 Feb 2023 16:00:08 +0000 Message-Id: <20230216160012.272345-7-kristina.martsenko@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230216160012.272345-1-kristina.martsenko@arm.com> References: <20230216160012.272345-1-kristina.martsenko@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758004272182194299?= X-GMAIL-MSGID: =?utf-8?q?1758004272182194299?= As FEAT_MOPS is not supported in guests yet, hide it from the ID registers for guests. The MOPS instructions are UNDEFINED in guests as HCRX_EL2.MSCEn is not set in HCRX_GUEST_FLAGS, and will take an exception to EL1 if executed. Signed-off-by: Kristina Martsenko Acked-by: Catalin Marinas --- arch/arm64/kvm/sys_regs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 0bc7df55916e..3456205c6b92 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1213,6 +1213,7 @@ static u64 read_id_reg(const struct kvm_vcpu *vcpu, struct sys_reg_desc const *r ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_GPA3)); if (!cpus_have_final_cap(ARM64_HAS_WFXT)) val &= ~ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_WFxT); + val &= ~ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_MOPS); break; case SYS_ID_AA64DFR0_EL1: /* Limit debug to ARMv8.0 */