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 15559C4167B for ; Wed, 6 Dec 2023 10:05:47 +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=kfZKYORxudjyBnnzlgNTtY5HEZDB2dPv657dJ5fMZd8=; b=bPSiBEaPZZAg5wozse6KA9YGtq kU4IW2IewtcHeLuzsESbiJuVkDp+Pt7+ZyLOtS6mJReioRWt+ZORLsSY8UIU/xEd3iQmSjmcIdsAW 2cvwlbOcaN2j+fh2KRr29KM9+8zA3sB4GAhjiA0rJa5RqPHqebHI81CnaZN6pxQ9KEEfH4tiLEvC8 aFAgLzpz8dkGW4jZkl7gG6T7OsgnROOyy9QSeAI8+1R0XLgfl7Bhpy29vQYZMFqaBwLkWzWqUszkb rJLgTYIv2ddhPKj6a4RbAokK3GRkw1ZrjXc1fUqto+2qeJ/IfKeRCsdIkmQBaFJaXhAPCNL0JBLY0 xnA6JnbA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAomM-009d57-1d; Wed, 06 Dec 2023 10:05:18 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAomI-009d2h-0a for linux-arm-kernel@lists.infradead.org; Wed, 06 Dec 2023 10:05:15 +0000 Received: by mail-wr1-x449.google.com with SMTP id ffacd0b85a97d-33349915da3so524523f8f.0 for ; Wed, 06 Dec 2023 02:05:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701857110; x=1702461910; 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=fllstZe0TUWUwjolPsk8Qr4Z05k2c/KSz4LIDdDQWR0=; b=OGZr+7ZI63lK8yQLi5EfD+ueE8TwsJJfnh2WdL/lTnxJT7znXaY3tmQbHL+3dZZ34M aEFpXAP5Ex5qasZBUQJGwzRqCOg/dfqfXMpCknOiRjbjZjUJUIEUHL6/SJmLi9fr3QQ7 3qQDRenmYDSZdbhQCld5WL+Occ58kuN36zHsuV99cpyJwYdtocaLAt872xVLDaIacgM9 iqeXHvdYduXzmVA2ziqSj6SEsjA6SczgtXZUPiXhoTL2XRUJNBtvXfPY7QCZBuPIDBV7 M/ug1sSPICMCVPaaWaYDAMF5JB0J9qDkv+ddcaMe0042HutEFKYkF+x/VzUHJwjXqIAb ZlVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701857110; x=1702461910; 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=fllstZe0TUWUwjolPsk8Qr4Z05k2c/KSz4LIDdDQWR0=; b=gj/Y8eC9dWb9T6EOkshVzGteHlu2+JTttyH07m6zU0z+7aixhvF7fH2wjv8bx9QByy 9i/ksu8GNkdI7koXM7a6c915E7TAZpCYAMo8o4E9mPH2OwWXIwoOo2PhKcfsE0wQmHc5 wY18NvIDQ5oSonLlCdhsIJNyXIZINW8spiuf1GxJIRQdeDxXO6RhIcqq/77q5F1oDknp /gWzPW8UDce45qo4YWryCBLKuV91WdKdLRbplxVV+ssLHmgL1HH2TmpY/L1Qe6S/Yl4m C5n409I2VX6wE5OWEAlqD59VDwsmUMMhCMm408de/urjKyi66pxZtknIwkKZkiYxfb1Y 5vjQ== X-Gm-Message-State: AOJu0YwdAOKbbnD993WMLYhfNILx6lxjVCAyOkrmvJYzb+Ek646Yvi6v Dt0UccCQcOkeephgG2hjk3Sj8Hba2Q== X-Google-Smtp-Source: AGHT+IG8bFxlibva7s7MJBG/XyNjr1Q5Cs+KItTvcqc4K1NmdWg8tSPNsolg5Kegs6PDsLRL7MvOG4cOwQ== X-Received: from fuad.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1613]) (user=tabba job=sendgmr) by 2002:a05:6000:111:b0:333:3f96:6eb8 with SMTP id o17-20020a056000011100b003333f966eb8mr2882wrx.14.1701857109880; Wed, 06 Dec 2023 02:05:09 -0800 (PST) Date: Wed, 6 Dec 2023 10:04:52 +0000 In-Reply-To: <20231206100503.564090-1-tabba@google.com> Mime-Version: 1.0 References: <20231206100503.564090-1-tabba@google.com> X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog Message-ID: <20231206100503.564090-3-tabba@google.com> Subject: [PATCH v2 02/12] KVM: arm64: Add latest HFGxTR_EL2 FGT entries to nested virt From: Fuad Tabba To: kvmarm@lists.linux.dev Cc: maz@kernel.org, oliver.upton@linux.dev, 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-20231206_020514_223930_8580AEB8 X-CRM114-Status: UNSURE ( 9.56 ) 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 Add the missing nested virt FGT table entries HFGxTR_EL2. Based on the 2023-09 Arm Architecture System Registers xml specification [*]. Also adds definitions of some of the missing system registers, which can be trapped by the FGT bits. [*] https://developer.arm.com/downloads/-/exploration-tools Signed-off-by: Fuad Tabba --- arch/arm64/include/asm/sysreg.h | 13 +++++++++++++ arch/arm64/kvm/emulate-nested.c | 10 ++++++++++ 2 files changed, 23 insertions(+) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 5e65f51c10d2..7b469b3ac1f9 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -297,6 +297,10 @@ #define SYS_APGAKEYLO_EL1 sys_reg(3, 0, 2, 3, 0) #define SYS_APGAKEYHI_EL1 sys_reg(3, 0, 2, 3, 1) +#define SYS_GCSCR_EL1 sys_reg(3, 0, 2, 5, 0) +#define SYS_GCSPR_EL1 sys_reg(3, 0, 2, 5, 1) +#define SYS_GCSCRE0_EL1 sys_reg(3, 0, 2, 5, 2) + #define SYS_SPSR_EL1 sys_reg(3, 0, 4, 0, 0) #define SYS_ELR_EL1 sys_reg(3, 0, 4, 0, 1) @@ -356,7 +360,11 @@ #define SYS_PMMIR_EL1 sys_reg(3, 0, 9, 14, 6) #define SYS_MAIR_EL1 sys_reg(3, 0, 10, 2, 0) +#define SYS_MAIR2_EL1 sys_reg(3, 0, 10, 2, 1) +#define SYS_POR_EL1 sys_reg(3, 0, 10, 2, 4) +#define SYS_S2POR_EL1 sys_reg(3, 0, 10, 2, 5) #define SYS_AMAIR_EL1 sys_reg(3, 0, 10, 3, 0) +#define SYS_AMAIR2_EL1 sys_reg(3, 0, 10, 3, 1) #define SYS_VBAR_EL1 sys_reg(3, 0, 12, 0, 0) #define SYS_DISR_EL1 sys_reg(3, 0, 12, 1, 1) @@ -390,6 +398,7 @@ #define SYS_ICC_IGRPEN1_EL1 sys_reg(3, 0, 12, 12, 7) #define SYS_ACCDATA_EL1 sys_reg(3, 0, 13, 0, 5) +#define SYS_RCWMASK_EL1 sys_reg(3, 0, 13, 0, 6) #define SYS_CNTKCTL_EL1 sys_reg(3, 0, 14, 1, 0) @@ -398,6 +407,8 @@ #define SYS_RNDR_EL0 sys_reg(3, 3, 2, 4, 0) #define SYS_RNDRRS_EL0 sys_reg(3, 3, 2, 4, 1) +#define SYS_GCSPR_EL0 sys_reg(3, 3, 2, 5, 1) + #define SYS_PMCR_EL0 sys_reg(3, 3, 9, 12, 0) #define SYS_PMCNTENSET_EL0 sys_reg(3, 3, 9, 12, 1) #define SYS_PMCNTENCLR_EL0 sys_reg(3, 3, 9, 12, 2) @@ -412,6 +423,8 @@ #define SYS_PMUSERENR_EL0 sys_reg(3, 3, 9, 14, 0) #define SYS_PMOVSSET_EL0 sys_reg(3, 3, 9, 14, 3) +#define SYS_POR_EL0 sys_reg(3, 3, 10, 2, 4) + #define SYS_TPIDR_EL0 sys_reg(3, 3, 13, 0, 2) #define SYS_TPIDRRO_EL0 sys_reg(3, 3, 13, 0, 3) #define SYS_TPIDR2_EL0 sys_reg(3, 3, 13, 0, 5) diff --git a/arch/arm64/kvm/emulate-nested.c b/arch/arm64/kvm/emulate-nested.c index 06185216a297..8b473a1bbc11 100644 --- a/arch/arm64/kvm/emulate-nested.c +++ b/arch/arm64/kvm/emulate-nested.c @@ -1042,10 +1042,20 @@ enum fg_filter_id { static const struct encoding_to_trap_config encoding_to_fgt[] __initconst = { /* HFGRTR_EL2, HFGWTR_EL2 */ + SR_FGT(SYS_AMAIR2_EL1, HFGxTR, nAMAIR2_EL1, 0), + SR_FGT(SYS_MAIR2_EL1, HFGxTR, nMAIR2_EL1, 0), + SR_FGT(SYS_S2POR_EL1, HFGxTR, nS2POR_EL1, 0), + SR_FGT(SYS_POR_EL1, HFGxTR, nPOR_EL1, 0), + SR_FGT(SYS_POR_EL0, HFGxTR, nPOR_EL0, 0), SR_FGT(SYS_PIR_EL1, HFGxTR, nPIR_EL1, 0), SR_FGT(SYS_PIRE0_EL1, HFGxTR, nPIRE0_EL1, 0), + SR_FGT(SYS_RCWMASK_EL1, HFGxTR, nRCWMASK_EL1, 0), SR_FGT(SYS_TPIDR2_EL0, HFGxTR, nTPIDR2_EL0, 0), SR_FGT(SYS_SMPRI_EL1, HFGxTR, nSMPRI_EL1, 0), + SR_FGT(SYS_GCSCR_EL1, HFGxTR, nGCS_EL1, 0), + SR_FGT(SYS_GCSPR_EL1, HFGxTR, nGCS_EL1, 0), + SR_FGT(SYS_GCSCRE0_EL1, HFGxTR, nGCS_EL0, 0), + SR_FGT(SYS_GCSPR_EL0, HFGxTR, nGCS_EL0, 0), SR_FGT(SYS_ACCDATA_EL1, HFGxTR, nACCDATA_EL1, 0), SR_FGT(SYS_ERXADDR_EL1, HFGxTR, ERXADDR_EL1, 1), SR_FGT(SYS_ERXPFGCDN_EL1, HFGxTR, ERXPFGCDN_EL1, 1), -- 2.43.0.rc2.451.g8631bc7472-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel