From patchwork Wed Sep 13 18:52:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Luis X-Patchwork-Id: 139359 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp157341vqi; Wed, 13 Sep 2023 23:54:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+BjTt5ujDLezq8lnw1XxnO8sIRLFzccwQ9bHEW/3sKW54nFnV4oWPX7hEmjgWXqPQNU/z X-Received: by 2002:a17:90a:e7d0:b0:273:f229:a479 with SMTP id kb16-20020a17090ae7d000b00273f229a479mr4413710pjb.34.1694674454091; Wed, 13 Sep 2023 23:54:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694674454; cv=none; d=google.com; s=arc-20160816; b=SXDRtUQMEK7qNhXqbc51X13Q9QjlCCLJoijpq3C/Bsb5CfLdHGLnjFDLVsI4FbnWQD znG8BuHrdaFL6Cs0JTWzLUK8k635d+0ng7/TcsZ05L+UvQOZEiytxsj7hSVZ6OfMPJ0K 6jBlHWhpo73s9SFx29ql7YEvRQJKVUgVVFVV791IR5IJm0hV/nnNGQuXgwY/UKxfiQV2 XkbRYVTr6AGX63HmwysHWHyKTR/klc0/o6iZF0TKeMfrC+OWu3NQV8w4XbKspwz6J63d gPHIy3ktIKSIjuThJmYvnbCK9vW3m+qjkhA7wLEvF8lccgIlKdPWjeuRDW05wpryb9oY i83g== 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=A844yIWuMRb64sCEYqTp6ujmssih0gRor/csqDcYRbE=; fh=UEH6cFyH1ghvNrfwViNbncCn5r9iy89nkA/jfjQrZCI=; b=cLxg+dUJEQYwNOwgeA9przxv5PmZT8h7KR20O5eYZuBs/WnwRvM60AkHj7VgrJOf77 ITs4+ImPOiBtVZ0kp3IiYk4Drp50La586gOi+VsTB7K4SUQBe9S+OkoWJihIgRx0T49D NCT2xEkJd5eP2k9bsnTUMP1jjssETIu6p4CmYP5FkO/I2yHtWDDD8F4CAqkPwDFxvGaT eg5x15tqFbKTqmJpUgx8x2ukAqK1u+ooXLfzYgzE3ZWt9Ef6Z/4BWZZVgjdUKLLApWAG uK5IfO50VsLoJJEHkm86irz/1ZoVKR0nooNyLgN8FttQzigtCEpLD9e6Aic4lWnp4hA2 ys0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=vOQ87fDt; 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 pf5-20020a17090b1d8500b00263a2156cd5si1201700pjb.30.2023.09.13.23.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 23:54:14 -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=vOQ87fDt; 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 7E625826CB5D; Wed, 13 Sep 2023 11:53:29 -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 S231980AbjIMSxX (ORCPT + 34 others); Wed, 13 Sep 2023 14:53:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231981AbjIMSxV (ORCPT ); Wed, 13 Sep 2023 14:53:21 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8E641BC8 for ; Wed, 13 Sep 2023 11:53:17 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 38DHFHv0032248; Wed, 13 Sep 2023 18:53:00 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=A844yIWuMRb64sCEYqTp6ujmssih0gRor/csqDcYRbE=; b=vOQ87fDt6OmB7ygGRkWM2FxqEop2F2kMikyLvpM8sPjjL7NORuY4/f4/lL88IcTmGW92 cHBeJMW1MdLOhrJCdGrXqn3bUZzvAyrRdf82EwWxc4mOHoFhtTj2l17jdYHLQZ/gOcU+ hjRGchV9eUB8JWZT6sHeFh4WBSPFMUHT0tZ6YuaoXVSV6hZcd655L3DulTXiQjBd/I3H ykZYqdhVtqVt7U68NmUZE4VWOdfoU/rNcCruZzpQ9cCUOfxnmbdZ0YQ7ynUAn+BWyX6Z GyiyGsXTnrNWkoGtRkUO5euiEp04Ezr7DU1DLJ9zu/JVoKCimkuTYvIOSVcSobTl9FIT /g== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3t2y7mtv5c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Sep 2023 18:52:59 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 38DHpQG7032938; Wed, 13 Sep 2023 18:52:58 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3t0wkgxr65-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Sep 2023 18:52:58 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 38DIqniq015352; Wed, 13 Sep 2023 18:52:57 GMT Received: from mlluis-mac.uk.oracle.com (dhcp-10-175-187-203.vpn.oracle.com [10.175.187.203]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3t0wkgxqyp-2; Wed, 13 Sep 2023 18:52:57 +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 1/3] arm64: Add missing _EL12 encodings Date: Wed, 13 Sep 2023 18:52:06 +0000 Message-Id: <20230913185209.32282-2-miguel.luis@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230913185209.32282-1-miguel.luis@oracle.com> References: <20230913185209.32282-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.601,FMLib:17.11.176.26 definitions=2023-09-13_13,2023-09-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 phishscore=0 spamscore=0 mlxlogscore=918 bulkscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000 definitions=main-2309130158 X-Proofpoint-ORIG-GUID: dHwUZyW_SLzKwxdJe8FeOkuqD09qGYuw X-Proofpoint-GUID: dHwUZyW_SLzKwxdJe8FeOkuqD09qGYuw 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]); Wed, 13 Sep 2023 11:53:29 -0700 (PDT) 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776994960551041578 X-GMAIL-MSGID: 1776994960551041578 Some _EL12 encodings are missing. Add them. Signed-off-by: Miguel Luis --- 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..c8b39f65660b 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 Wed Sep 13 18:52:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Luis X-Patchwork-Id: 139250 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp65929vqi; Wed, 13 Sep 2023 19:31:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGqzaARvgRVVK2lxmJHv/X45VCBpU5pFRbkXoDpcL89+JvEfdS7K6h5FzA5w80GOYmdcvje X-Received: by 2002:a17:902:d502:b0:1bc:2fe1:1821 with SMTP id b2-20020a170902d50200b001bc2fe11821mr829227plg.17.1694658712579; Wed, 13 Sep 2023 19:31:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694658712; cv=none; d=google.com; s=arc-20160816; b=xk70kglp+HZR2Ki21D0tbYIzW6gLaGEaPGkplo8f4QhNM05rsHXfPvbUmNx5BD/ShD nfleiEn0LcYZaEWSeMh9FN5DOXHALxoSuH7cQkNuDOG0pS06+JVPIPiXuu/ZyI+dyFXi JSW4RJSbJUCKjpvidCWWLrZ8grrIqGptbzIZKDQiw2XqBZ9NjJLweUmbe6yBAk7bR/gQ 0/dhX6U+f1wPpwzLcRzkcxyoj+MVzYecW8HpkkQpdVJ+b0vFP+gfJZWsrdFzJl009p6Q Fn3kSX6eqZxFbpvmkRi5cWMPCx+v+FhCRaQdgx6FSMKnLBJBiY/O9oO7J7DUeWYbzdMt /Bbw== 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=Zk8F3NwTpSlJTJNRWp7Z/CPcOvwP0TogqcqsVm1ZAWo=; fh=UEH6cFyH1ghvNrfwViNbncCn5r9iy89nkA/jfjQrZCI=; b=e6aKIjtwZPY0s8eiAyUhHIqLjhtGWlwhsocgUcf9UnpQ/1Q9jvI9s4FabqGqTfeYb8 FwOx2nDD95pF5rcKEI4WHjvicnSYGWdKR8PVLjvhqkvR0ECsyhIZN7QXc1SknpgEJ3EZ XlpidVfdMwK1nPg8CJfgASLPf1PtW5/gUuTNo5ztRnQEvQ9C4eeoWRGnd7oQRT/lQcW6 pkyk8cHfI5SEH9yJzKooDKhn+2t4YHd1ORbgW525XpXYuHseF3YayCHMfKcn94nXrPkh Jo1oNBIjK2GlSzEVCwGiEMS9RN4aJV7hdQd3ajOzbB7FKO4WiFiLZ9STNcbRKBpf+iaJ bb9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=EyT9M0xr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id u17-20020a17090341d100b001b8af930e3dsi712965ple.487.2023.09.13.19.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 19:31:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=EyT9M0xr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 0297E81D82F1; Wed, 13 Sep 2023 11:53:40 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232027AbjIMSxf (ORCPT + 34 others); Wed, 13 Sep 2023 14:53:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232025AbjIMSxc (ORCPT ); Wed, 13 Sep 2023 14:53:32 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C5ED1985 for ; Wed, 13 Sep 2023 11:53:28 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 38DG0Awj015441; Wed, 13 Sep 2023 18:53:05 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=Zk8F3NwTpSlJTJNRWp7Z/CPcOvwP0TogqcqsVm1ZAWo=; b=EyT9M0xrBxgbbEifS4Ab75tRq+kizVB4kd9dfKFTi0zI6zQF5Tmn03gYwyosx5RdEl6p CEHCFmVkKo/ATZv/ifH23oDRvqXkhr4bo+1/I5Lrd1TxePkRMysOwn0cvUJzHtezmm40 fZtITLNNYiGGhk2ops0dlmJcGf9c+H1N/jQ5GN6quI9/o+WSc3TjCKyd2m9WcLeDY65U zcNh2rK0vfbVNW2Vbj5SvZOuyYC0Heraofd97aQXW4T1QGqEsk/vPuvA6U9Cq2WXvrdR /SIXkrnP6ZmOu9qPvScEJgOQF23SdeJ5Qh5WbCysYd7pXJ0/bIZwAjETk4+fMuL/yPWw 3A== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3t37jr29w8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Sep 2023 18:53:05 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 38DHUJLw033661; Wed, 13 Sep 2023 18:53:04 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3t0wkgxr9w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Sep 2023 18:53:04 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 38DIqnis015352; Wed, 13 Sep 2023 18:53:04 GMT Received: from mlluis-mac.uk.oracle.com (dhcp-10-175-187-203.vpn.oracle.com [10.175.187.203]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3t0wkgxqyp-3; Wed, 13 Sep 2023 18:53: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 2/3] arm64/kvm: Fine grain _EL2 system registers list that affect nested virtualization Date: Wed, 13 Sep 2023 18:52:07 +0000 Message-Id: <20230913185209.32282-3-miguel.luis@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230913185209.32282-1-miguel.luis@oracle.com> References: <20230913185209.32282-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.601,FMLib:17.11.176.26 definitions=2023-09-13_13,2023-09-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 phishscore=0 spamscore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000 definitions=main-2309130158 X-Proofpoint-ORIG-GUID: Dh1TksJyigA7T7y8HD447THG5JQIwbWt X-Proofpoint-GUID: Dh1TksJyigA7T7y8HD447THG5JQIwbWt 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 (agentk.vger.email [0.0.0.0]); Wed, 13 Sep 2023 11:53:40 -0700 (PDT) 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 agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776978453688025676 X-GMAIL-MSGID: 1776978453688025676 Some _EL1 registers got included in the _EL2 ranges, which are not affected by NV. Remove them and fine grain the ranges to exclusively include the _EL2 ones. 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..9aa1c06abdb7 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), + /* skip 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_TRAP(SYS_ICH_LR0_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR1_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR2_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR3_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR4_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR5_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR6_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR7_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR8_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR9_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR10_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR11_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR12_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR13_EL2, CGT_HCR_NV), + SR_TRAP(SYS_ICH_LR14_EL2, CGT_HCR_NV), + SR_TRAP(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), + /* skip AMEVCNTVOFF0_EL2 and AMEVCNTVOFF1_EL2 */ + 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), From patchwork Wed Sep 13 18:52:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Luis X-Patchwork-Id: 139038 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp16841vqb; Wed, 13 Sep 2023 11:53:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFyqxR5N8UAvHAG1wXZKkbEjYoFuSHRbZfMNYAK0Gz6P2NOBEHtgejVqaUlfnRi8nxWoMx5 X-Received: by 2002:a17:90b:3ecd:b0:26d:2162:f596 with SMTP id rm13-20020a17090b3ecd00b0026d2162f596mr3005715pjb.6.1694631227486; Wed, 13 Sep 2023 11:53:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694631227; cv=none; d=google.com; s=arc-20160816; b=uCYkZ7vs77gxTo4oerO2xppSwKqrBq99ZYbcVqj3sb28sUIAcam5oJZCRC+Roj8567 dJSdstRCRqFIi0/oxVWYAs/1eraFxbL/YWeP/2zG15lH1TsE1ichLQRsebOFuapluxE4 QAuNLVxypYKV1kdw8MXjYSdcbdXdGLf8b4aaRSxjNeN3537Vom+PgZsMcRNacK7sC/54 kpWu1gbv0X7Mj6f9FoR7irHidQME69yXGMnKuYDPLhIUgNhf0ECnjNuLczIK+uj0uuTa l7R0HdkS7n9RmYE7M9E2tCElBkhpFYuqV3/vBtqUiFt6wcZzvxhwI3FM0N/LLSwClf7H JTsQ== 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=WvnFDh8VGVX/yU+Sr+zbmMR9RVMpMl1pTRBM4gjviOE=; fh=UEH6cFyH1ghvNrfwViNbncCn5r9iy89nkA/jfjQrZCI=; b=NwYWjFOilL6708JN9atdU3SNtG94fEzsIEbSBZC9F6PQZgbp0Ky2tE/uNCKwVrTGjM bEWR6LJe1AJSdcF+228/ckpYO8V6gF4gO8FDcgdFA1YCMXCS0zxJBykvyabGLiJWOFMK q33yWYqL5gpzDPc3QG67L8pWSpNitt9ye53VVYLAQJAU3mMcbHQdqFBsLG4mmQFdrII0 hbbUw0ktx1nt1JACJsBgKwnjBWHHuFO+JHKZq6TZWeFTdLNYg0KhUzqTG0Y95oWasGp7 7gjPEYY0euqlkEb6ZzYDNOZt85Kpi1BYWxufNzW6oEaYU7CeHdbmYxp9UBj24fGNGTrg toXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=NMuwXlq9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id em21-20020a17090b015500b0026cf0b7e813si2088661pjb.94.2023.09.13.11.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:53:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=NMuwXlq9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id B6149827D0E0; Wed, 13 Sep 2023 11:53:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232025AbjIMSxh (ORCPT + 34 others); Wed, 13 Sep 2023 14:53:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232036AbjIMSxd (ORCPT ); Wed, 13 Sep 2023 14:53:33 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C1FB1BC9 for ; Wed, 13 Sep 2023 11:53:29 -0700 (PDT) Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 38DFWIsp029849; Wed, 13 Sep 2023 18:53:12 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=WvnFDh8VGVX/yU+Sr+zbmMR9RVMpMl1pTRBM4gjviOE=; b=NMuwXlq9NfKpmcXFVR1MMSbr/Y1axUS9esvC1WZNAahpB9wmgXZr76nj2xCcGI7HWEx/ u4VzQ21ybwDHnD0lk4fyujfGfoVrR3XZUwQgjw04JFukpktw7qIhvluUeKRAcoxs0Ie6 qMwXZ1PEXQJGHtJNvoukrmzs6zCUN/Yz1MCgZxQNJGktQEYfU5oNrW2X0IKKQZLHVeDD SZrLtuIjgr7ZkjGv1utvL1wBE5XUUlboo9/G2sS7UjYtj6Sk36e4OgVI6aeB6KubIJ/8 h96pA42lSFXMP+/rqw/3FiJ5YjqRH58aTATJc1ZLfdewZg5hH/GUxKyoVfHHljb4IuFe aA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3t2y7rb2f7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Sep 2023 18:53:11 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 38DHhnGB033088; Wed, 13 Sep 2023 18:53:11 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3t0wkgxrep-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Sep 2023 18:53:11 +0000 Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 38DIqniu015352; Wed, 13 Sep 2023 18:53:10 GMT Received: from mlluis-mac.uk.oracle.com (dhcp-10-175-187-203.vpn.oracle.com [10.175.187.203]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3t0wkgxqyp-4; Wed, 13 Sep 2023 18:53:10 +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 3/3] KVM: arm64: nv: Handle all _EL02 and _EL12 registers Date: Wed, 13 Sep 2023 18:52:08 +0000 Message-Id: <20230913185209.32282-4-miguel.luis@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230913185209.32282-1-miguel.luis@oracle.com> References: <20230913185209.32282-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.601,FMLib:17.11.176.26 definitions=2023-09-13_13,2023-09-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 phishscore=0 spamscore=0 mlxlogscore=919 bulkscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000 definitions=main-2309130158 X-Proofpoint-ORIG-GUID: NESHB0hhIH2rACbKdDapKjxhrgfZITx3 X-Proofpoint-GUID: NESHB0hhIH2rACbKdDapKjxhrgfZITx3 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 (morse.vger.email [0.0.0.0]); Wed, 13 Sep 2023 11:53:44 -0700 (PDT) X-Spam-Status: No, score=-0.1 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,UPPERCASE_50_75 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776949634112783556 X-GMAIL-MSGID: 1776949634112783556 Specify both _EL02 and _EL12 system registers. Signed-off-by: Miguel Luis --- arch/arm64/kvm/emulate-nested.c | 35 +++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/emulate-nested.c b/arch/arm64/kvm/emulate-nested.c index 9aa1c06abdb7..957afd97e488 100644 --- a/arch/arm64/kvm/emulate-nested.c +++ b/arch/arm64/kvm/emulate-nested.c @@ -690,10 +690,37 @@ static const struct encoding_to_trap_config encoding_to_cgt[] __initconst = { 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), - SR_RANGE_TRAP(sys_reg(3, 5, 12, 0, 0), - sys_reg(3, 5, 14, 15, 7), CGT_HCR_NV), + SR_TRAP(SYS_SCTLR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_CPACR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_SCTLR2_EL12, CGT_HCR_NV), + SR_TRAP(SYS_ZCR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_TRFCR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_SMCR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_TTBR0_EL12, CGT_HCR_NV), + SR_TRAP(SYS_TTBR1_EL12, CGT_HCR_NV), + SR_TRAP(SYS_TCR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_TCR2_EL12, CGT_HCR_NV), + SR_TRAP(SYS_SPSR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_ELR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_AFSR0_EL12, CGT_HCR_NV), + SR_TRAP(SYS_AFSR1_EL12, CGT_HCR_NV), + SR_TRAP(SYS_ESR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_TFSR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_FAR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_BRBCR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_PMSCR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_MAIR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_AMAIR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_VBAR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_CONTEXTIDR_EL12, CGT_HCR_NV), + SR_TRAP(SYS_SCXTNUM_EL12, CGT_HCR_NV), + SR_TRAP(SYS_CNTKCTL_EL12, CGT_HCR_NV), + SR_TRAP(SYS_CNTP_TVAL_EL02, CGT_HCR_NV), + SR_TRAP(SYS_CNTP_CTL_EL02, CGT_HCR_NV), + SR_TRAP(SYS_CNTP_CVAL_EL02, CGT_HCR_NV), + SR_TRAP(SYS_CNTV_TVAL_EL02, CGT_HCR_NV), + SR_TRAP(SYS_CNTV_CTL_EL02, CGT_HCR_NV), + SR_TRAP(SYS_CNTV_CVAL_EL02, CGT_HCR_NV), SR_TRAP(OP_AT_S1E2R, CGT_HCR_NV), SR_TRAP(OP_AT_S1E2W, CGT_HCR_NV), SR_TRAP(OP_AT_S12E1R, CGT_HCR_NV),