From patchwork Mon Sep 25 16:20:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Luis X-Patchwork-Id: 144525 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1401100vqu; Mon, 25 Sep 2023 11:23:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzhNAES73JgVGCTymFzxg73B3abtGeRHx5wwSI6ExEzcH4jDbiUM3tQ/d6AwElB92e45DH X-Received: by 2002:a05:6a21:35c2:b0:15d:4a2b:b50c with SMTP id ba2-20020a056a2135c200b0015d4a2bb50cmr4354535pzc.56.1695666219216; Mon, 25 Sep 2023 11:23:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695666219; cv=none; d=google.com; s=arc-20160816; b=M5g55GGcH0pYDKuP58XeiBUulhhQODDB4/PiczuAeot/uTKfWhTsBdFfBzO9Xc7JHa Ji2SWw6PCCxhTGnY2Ty4GwgngcmgO87x3sJaIXEEQCgJRe7ZwgSEjERaK1bBKULBHnM6 GcfaX5f8gV/1FqRlJTOxvMyYBI25qUi/PL4mediS0OOl65HYrsu7YLPH4s6hLzo1gcly ZDB4ybPY4yG/ATpdV+EJjrGa9gvo1oVLGK61M2SMavO2xlTYbTyWnpaCgb38BNZKqC/E z1FU//nTHmvOV7+irniSghivO7UqM//PUFTBrZ1gmLU7lkwcqIMGv3DGlDYXs4FPkrLs NQ5A== 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 :dkim-signature; bh=tvy6Z6szTq1bAkmZQeSWwGo173Ev+55Y3onQnABhxWE=; fh=UEH6cFyH1ghvNrfwViNbncCn5r9iy89nkA/jfjQrZCI=; b=xVIveAEsSGQnqjDIbxedl9g3n0xm5V8EXJL02TjhpvjjNP1ZyPVwO8vwknmk74IPDJ NZE0dnrqN2Jv+ETxBDIIA3la9Tqtxd7jIzjagHjN6tPIZo7UGbtQCNQsOStLceBt1SZz b+VWk84yCOtdcbhFCclBjVowOxE9UE/rucBVyzD3HtO7sINXGpGplW3sArllChUDRPbM mzZlWP+n8d0V+IA/oYlNoVHgT7DjKd3sga1hFD0d9I8EK7T3mHE3Xg2SPaPBRkUjxcjU R4kOBKYi4WHhuYfSnG9Zh/gFAOGIn/SIyPtqzikHfG7BjI+O68AZbYrv8nnlDs2OX76r zkXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=0b4AwQ0q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id fo11-20020a056a00600b00b0068896ba4a3fsi10553055pfb.129.2023.09.25.11.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 11:23:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=0b4AwQ0q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 8F3AD823267C; Mon, 25 Sep 2023 09:22:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231226AbjIYQWb (ORCPT + 29 others); Mon, 25 Sep 2023 12:22:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231213AbjIYQWa (ORCPT ); Mon, 25 Sep 2023 12:22:30 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 302F0BE for ; Mon, 25 Sep 2023 09:22:24 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 38PECECD002029; Mon, 25 Sep 2023 16:22:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2023-03-30; bh=tvy6Z6szTq1bAkmZQeSWwGo173Ev+55Y3onQnABhxWE=; b=0b4AwQ0qGeBCDjIUBsIw+iJIfPLliB4+j5+kmZOHZwCnFvA6N/7pL5VeFc9GG05/q52E BzVqVF04dftXPZqhSH49fTHLP2lSZ1w1EFa0C9f5X4zP4KnmEuO2+q8VDZOS6s+Gs90w RpKwWMiFTGubE0NTwI9gC0s/i2cKDrG0kKxZg9Zoyv6MnN11T0X0oFQvXx1FtH0taG7S PvZkigoT359Z9oVmOiDKh47xZb7R5oKWV+BVE3vKVVo7z33ZYHb7D0HsiZYW1FzYw5eZ xnY8TwFDMzKS2aO23d7KgU9DwikrKYwbajY0oMhP2B42iJ/5r1VSDGF/puwH4NIHT0Aq rg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3t9rjuc48f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 Sep 2023 16:22:06 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 38PFZV6T034921; Mon, 25 Sep 2023 16:22:05 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3t9pf4ydsx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 Sep 2023 16:22:05 +0000 Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 38PGLi20024071; Mon, 25 Sep 2023 16:22:04 GMT Received: from mlluis-mac.uk.oracle.com (dhcp-10-175-170-37.vpn.oracle.com [10.175.170.37]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3t9pf4ycur-2; Mon, 25 Sep 2023 16:22:04 +0000 From: Miguel Luis To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev Cc: miguel.luis@oracle.com Subject: [PATCH v2 1/2] arm64: Add missing _EL12 encodings Date: Mon, 25 Sep 2023 16:20:56 +0000 Message-Id: <20230925162057.27548-2-miguel.luis@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230925162057.27548-1-miguel.luis@oracle.com> References: <20230925162057.27548-1-miguel.luis@oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-09-25_13,2023-09-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 mlxscore=0 mlxlogscore=984 suspectscore=0 phishscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2309250126 X-Proofpoint-ORIG-GUID: mPV9hicQh9mSiFp7cSPhziEQ-GfnxV-A X-Proofpoint-GUID: mPV9hicQh9mSiFp7cSPhziEQ-GfnxV-A X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 25 Sep 2023 09:22:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778034901682681786 X-GMAIL-MSGID: 1778034901682681786 Some _EL12 encodings are missing. Add them. Signed-off-by: Miguel Luis Reviewed-by: Eric Auger --- arch/arm64/include/asm/sysreg.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 38296579a4fd..6e167bbf44ff 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -568,18 +568,29 @@ /* VHE encodings for architectural EL0/1 system registers */ #define SYS_SCTLR_EL12 sys_reg(3, 5, 1, 0, 0) +#define SYS_CPACR_EL12 sys_reg(3, 5, 1, 0, 2) +#define SYS_SCTLR2_EL12 sys_reg(3, 5, 1, 0, 3) +#define SYS_ZCR_EL12 sys_reg(3, 5, 1, 2, 0) +#define SYS_TRFCR_EL12 sys_reg(3, 5, 1, 2, 1) +#define SYS_SMCR_EL12 sys_reg(3, 5, 1, 2, 6) #define SYS_TTBR0_EL12 sys_reg(3, 5, 2, 0, 0) #define SYS_TTBR1_EL12 sys_reg(3, 5, 2, 0, 1) #define SYS_TCR_EL12 sys_reg(3, 5, 2, 0, 2) +#define SYS_TCR2_EL12 sys_reg(3, 5, 2, 0, 3) #define SYS_SPSR_EL12 sys_reg(3, 5, 4, 0, 0) #define SYS_ELR_EL12 sys_reg(3, 5, 4, 0, 1) #define SYS_AFSR0_EL12 sys_reg(3, 5, 5, 1, 0) #define SYS_AFSR1_EL12 sys_reg(3, 5, 5, 1, 1) #define SYS_ESR_EL12 sys_reg(3, 5, 5, 2, 0) #define SYS_TFSR_EL12 sys_reg(3, 5, 5, 6, 0) +#define SYS_FAR_EL12 sys_reg(3, 5, 6, 0, 0) +#define SYS_BRBCR_EL12 sys_reg(3, 5, 9, 0, 0) +#define SYS_PMSCR_EL12 sys_reg(3, 5, 9, 9, 0) #define SYS_MAIR_EL12 sys_reg(3, 5, 10, 2, 0) #define SYS_AMAIR_EL12 sys_reg(3, 5, 10, 3, 0) #define SYS_VBAR_EL12 sys_reg(3, 5, 12, 0, 0) +#define SYS_CONTEXTIDR_EL12 sys_reg(3, 5, 13, 0, 1) +#define SYS_SCXTNUM_EL12 sys_reg(3, 5, 13, 0, 7) #define SYS_CNTKCTL_EL12 sys_reg(3, 5, 14, 1, 0) #define SYS_CNTP_TVAL_EL02 sys_reg(3, 5, 14, 2, 0) #define SYS_CNTP_CTL_EL02 sys_reg(3, 5, 14, 2, 1) From patchwork Mon Sep 25 16:20:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Luis X-Patchwork-Id: 144627 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1544577vqu; Mon, 25 Sep 2023 16:15:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEm+KlfS+2xnb9OYG1PoCvTZbE4pSI0V1ygmGXkxiZgbqSZAFLrVz+OE4TMtjbmw/zUR2Tu X-Received: by 2002:a05:6a00:21d0:b0:68e:3eb6:d45 with SMTP id t16-20020a056a0021d000b0068e3eb60d45mr6740742pfj.30.1695683734195; Mon, 25 Sep 2023 16:15:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695683734; cv=none; d=google.com; s=arc-20160816; b=Veew/9TYZGqRXCCkJJrYY8pE6usyE5LsHr3seQLXhNGSd0S8N+/bpz/F0t5bQQY8h6 Q7T15zgsacDOj3azQ1X2WyVCK0YsGaniJnAfoSa7W1DY5KEn/n4btx3fqF9eiLMntczd kbrd1zSDV5KMjU9kRkLzExnM6dzbBBmkINasfNMjg8Y389eHNhxBfRbd0pwixvYFg8T5 aVZjRgWvp5/M294xMqp4Fd6fGOYcLY8IOYU/MpgY8jy/yjpSdDp3czwJ4X7nfpSVBi+O LhN85o7dCLMqQb/+u1NoWSrH0egxRSXlVIESqSXBQE+JL8Fcl+jxgQ1Z/EkJhHQOopIg zHDw== 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 :dkim-signature; bh=80bWNtyVFFb+A7R10PXNfmbF2WAi7Ns30GPR0ShRTfM=; fh=UEH6cFyH1ghvNrfwViNbncCn5r9iy89nkA/jfjQrZCI=; b=HbF3lOo8ZBRp6E7i6Vhn2edNMvuiFYOuFG+vTTExbbZOd3LhTLkmdc/hh/uMkjdzOE vsgzsQObLL4iPagkOEeaKTDgZ6KYS96p7qxzP0zD5b/oRJ2tcoP2aO8kr8nFSvLMs6nm xNCWs/8JxoIL3APhtBmFK9B0bGOr2hTI47V9U0/xm2YKHXo+pi1O+M10Bs/HGgxOLBUK xt+JlAErdbDNwkFEOrxgKq/TxTKV+snAujrHF1xClQjhhOGg6lUDONWNZati/1HbdENg 91UWnv19v9f+yjM64AdTydkIAdDL7okrif1+KsGgGb6FMo2vYSKqTGLNlfQYCrDDBzVU lb2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=WY7aM8ee; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id v20-20020a056a00149400b0068c01fba736si12116273pfu.301.2023.09.25.16.15.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 16:15:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=WY7aM8ee; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id AA8E38215785; Mon, 25 Sep 2023 09:22:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231695AbjIYQWw (ORCPT + 29 others); Mon, 25 Sep 2023 12:22:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229522AbjIYQWv (ORCPT ); Mon, 25 Sep 2023 12:22:51 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47BA5E8 for ; Mon, 25 Sep 2023 09:22:44 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 38PECMDl017661; Mon, 25 Sep 2023 16:22:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2023-03-30; bh=80bWNtyVFFb+A7R10PXNfmbF2WAi7Ns30GPR0ShRTfM=; b=WY7aM8eevvIjOAFmJcvH681GQyveku4rM3CT4PhV9SYfqIvze4+ueMfNfbZ4jM2dq6vT OYAEWZX+gtCa8ZNW20257ipvXUkn6159/RpQ+FUZoEfT6P+qt3iOVB9ItYyQx33peW2p SajrmuqfplV6pluA/iNNSmw+tPd8ENR/TolhjE8Q+AUEolS+HWPDkMeiY2T2tCi+NIwm 2RBkfiiCJaQ6hgSOzatKoJDDuk8DiBSgIn4Rjk/sJU8Cg/+FbTVMWgZS0+d5k0HxV154 EMD348MBTY0nRfNEQfiem3lyhpNQ2Z0JJlZk8gbJjCebFcClCEZjoxPzKLpPxBYQW44C hg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3t9pt3m4t1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 Sep 2023 16:22:21 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 38PG8HfV034986; Mon, 25 Sep 2023 16:22:21 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3t9pf4ye89-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 Sep 2023 16:22:20 +0000 Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 38PGLi22024071; Mon, 25 Sep 2023 16:22:20 GMT Received: from mlluis-mac.uk.oracle.com (dhcp-10-175-170-37.vpn.oracle.com [10.175.170.37]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3t9pf4ycur-3; Mon, 25 Sep 2023 16:22:20 +0000 From: Miguel Luis To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev Cc: miguel.luis@oracle.com Subject: [PATCH v2 2/2] arm64/kvm: Fine grain _EL2 system registers list that affect nested virtualization Date: Mon, 25 Sep 2023 16:20:57 +0000 Message-Id: <20230925162057.27548-3-miguel.luis@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230925162057.27548-1-miguel.luis@oracle.com> References: <20230925162057.27548-1-miguel.luis@oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-09-25_13,2023-09-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 phishscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2309250126 X-Proofpoint-ORIG-GUID: 0at01WG6PMWVVC80OzCSmus-Wdc347wc X-Proofpoint-GUID: 0at01WG6PMWVVC80OzCSmus-Wdc347wc X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 25 Sep 2023 09:22:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778053267193575796 X-GMAIL-MSGID: 1778053267193575796 Some _EL1 registers got included in the _EL2 ranges, which are not affected by NV. Remove them, fine grain the ranges to exclusively include the _EL2 ones and fold SPSR/ELR _EL2 registers into the existing range. Signed-off-by: Miguel Luis --- arch/arm64/kvm/emulate-nested.c | 44 ++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/emulate-nested.c b/arch/arm64/kvm/emulate-nested.c index 9ced1bf0c2b7..f6d0c87803f4 100644 --- a/arch/arm64/kvm/emulate-nested.c +++ b/arch/arm64/kvm/emulate-nested.c @@ -649,14 +649,46 @@ static const struct encoding_to_trap_config encoding_to_cgt[] __initconst = { SR_TRAP(SYS_APGAKEYHI_EL1, CGT_HCR_APK), /* All _EL2 registers */ SR_RANGE_TRAP(sys_reg(3, 4, 0, 0, 0), - sys_reg(3, 4, 3, 15, 7), CGT_HCR_NV), + sys_reg(3, 4, 4, 0, 1), CGT_HCR_NV), /* Skip the SP_EL1 encoding... */ - SR_TRAP(SYS_SPSR_EL2, CGT_HCR_NV), - SR_TRAP(SYS_ELR_EL2, CGT_HCR_NV), - SR_RANGE_TRAP(sys_reg(3, 4, 4, 1, 1), - sys_reg(3, 4, 10, 15, 7), CGT_HCR_NV), + SR_RANGE_TRAP(sys_reg(3, 4, 4, 3, 0), + sys_reg(3, 4, 10, 6, 7), CGT_HCR_NV), + /* + * Note that the spec. describes a group of MEC registers + * whose access should not trap, therefore skip the following: + * MECID_A0_EL2, MECID_A1_EL2, MECID_P0_EL2, + * MECID_P1_EL2, MECIDR_EL2, VMECID_A_EL2, + * VMECID_P_EL2. + */ SR_RANGE_TRAP(sys_reg(3, 4, 12, 0, 0), - sys_reg(3, 4, 14, 15, 7), CGT_HCR_NV), + sys_reg(3, 4, 12, 1, 1), CGT_HCR_NV), + /* ICH_AP0R_EL2 */ + SR_RANGE_TRAP(SYS_ICH_AP0R0_EL2, + SYS_ICH_AP0R3_EL2, CGT_HCR_NV), + /* ICH_AP1R_EL2 */ + SR_RANGE_TRAP(SYS_ICH_AP1R0_EL2, + SYS_ICH_AP1R3_EL2, CGT_HCR_NV), + SR_RANGE_TRAP(sys_reg(3, 4, 12, 9, 5), + sys_reg(3, 4, 12, 11, 7), CGT_HCR_NV), + /* ICH_LR_EL2 */ + SR_RANGE_TRAP(SYS_ICH_LR0_EL2, + SYS_ICH_LR7_EL2, CGT_HCR_NV), + SR_RANGE_TRAP(SYS_ICH_LR8_EL2, + SYS_ICH_LR15_EL2, CGT_HCR_NV), + SR_RANGE_TRAP(sys_reg(3, 4, 13, 0, 1), + sys_reg(3, 4, 13, 0, 7), CGT_HCR_NV), + /* AMEVCNTVOFF0_EL2 */ + SR_RANGE_TRAP(sys_reg(3, 4, 13, 8, 0), + sys_reg(3, 4, 13, 8, 7), CGT_HCR_NV), + SR_RANGE_TRAP(sys_reg(3, 4, 13, 9, 0), + sys_reg(3, 4, 13, 9, 7), CGT_HCR_NV), + /* AMEVCNTVOFF1_EL2 */ + SR_RANGE_TRAP(sys_reg(3, 4, 13, 10, 0), + sys_reg(3, 4, 13, 10, 7), CGT_HCR_NV), + SR_RANGE_TRAP(sys_reg(3, 4, 13, 11, 0), + sys_reg(3, 4, 13, 11, 7), CGT_HCR_NV), + SR_RANGE_TRAP(sys_reg(3, 4, 14, 0, 3), + sys_reg(3, 4, 14, 5, 2), CGT_HCR_NV), /* All _EL02, _EL12 registers */ SR_RANGE_TRAP(sys_reg(3, 5, 0, 0, 0), sys_reg(3, 5, 10, 15, 7), CGT_HCR_NV),