From patchwork Tue Jan 18 19:14:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krish Sadhukhan X-Patchwork-Id: 12716844 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BE26C433EF for ; Tue, 18 Jan 2022 20:10:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348756AbiARUK3 (ORCPT ); Tue, 18 Jan 2022 15:10:29 -0500 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:17860 "EHLO mx0b-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343775AbiARUK1 (ORCPT ); Tue, 18 Jan 2022 15:10:27 -0500 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 20IK8Dt0002872; Tue, 18 Jan 2022 20:10:25 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 : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=ClgT80fqh5Danohnghv3DuP1WBvcTEp34OwN93zlkyc=; b=hvPOX+M21fPHl8StPkBNtuFDSvHvxU7EZ6rI8obuaJHelD2S7B9of7YCfEhJ+G5vBzSh SU833YoepSAP1GKKcIIodGLF+sXj7g2kVKMT8DKFsSFM0tZPVz0Md7S5/YZbkBhKaRy1 bBhD/u0wgxfaR8PsrtVTJAAzLirIKquN3pGfnnvz94PKTwMou9ClMTcbEL6nND/o2CLt /TDMjeUkKAWxr2gsItWzs4lOxOvY/m152Dw2h8UDqTTCNZiucFaRc5o61fWEQlHB5KDD 1X46fofQfVd1CemkGrGHvolBAFOly1/Qz0vqhEnidh8xeb1IkWM43uU6GodncElqdsh3 gA== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3dnbrnu1wh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jan 2022 20:10:24 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 20IK0PbU180361; Tue, 18 Jan 2022 20:10:24 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2105.outbound.protection.outlook.com [104.47.55.105]) by aserp3020.oracle.com with ESMTP id 3dkp34rapw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jan 2022 20:10:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SjP7Kdz0YInd5WGz0Fwtf5lymVTFR4iXoZpm/k1I0m+UdM1PfI46WSqpRd8YKjQkJOkxk7f3wOwIntW18GCn70M0LKpGGOsHzjvV/0Rr4j7HRvdmyYUUR77Acq6MPjaO0yW1AL4sif74cTX8Ais1Kq5lwhflH1LX88PA8atihGlr+Rr8YZx3jEaLhR3JDeZpJsVSPAkz2KjIa9M+9e0hEFgBXsGlP2ket1kC6zENk1W4j6cFc+1qfg6S/9PJQhLbSQw8FBfwNIiAic6VY+64w0ceo6JtP524JphCahfellAyX2ABh2tUejVcAm7g0a6Oo5MhDaPerHSDn5Ws+6jb6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ClgT80fqh5Danohnghv3DuP1WBvcTEp34OwN93zlkyc=; b=BEPxmduep3ioe/eWU4j6gpFNczBUWNBQbCuvBYwdnZNrsw7qItOHVS7kcXghfXGljiyWq2kMnTerAIHPvxBsErMsOrhpbucTvabnWu33sAKadz1CaA1DTKuxSRlL/o2no2PjGtG68dLzAp7VZbzZEZulIFRQ5lo0rhxnhZV7e0RR4zywhPjd9sYLazC0vg+nHqt0tFzDNZoMBf5vZCcYYinMC6mzE0yZwzzTHxU9Pwbo8ZpDUgLKKwAnVcAxFvZ0XvbKwRGhF1JVDwCug34a0u+IluHonMGx9s7OkNEUJCS0tLLiS/7l9SThAz+GLM3jq1Iqm9CwZGZKdGip1oV/5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ClgT80fqh5Danohnghv3DuP1WBvcTEp34OwN93zlkyc=; b=dGwQKgMPu/cFvVPNOvwBVRKe0PwiMank9sqiGHnoe4JOWKSeiQdL9dhHNlprThXUB6XVH6K7Ih313TezaN2PE3ueJ5Yy4+FXLrkWFQtBouFW2KxYeG0bsJl4WLvaLOQ3H4biIL4kbN+y7VfrxP77Vz+zG/LrwauQ8RJEriegVZ4= Received: from SN6PR10MB3021.namprd10.prod.outlook.com (2603:10b6:805:cc::19) by DM5PR1001MB2154.namprd10.prod.outlook.com (2603:10b6:4:2e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.12; Tue, 18 Jan 2022 20:10:21 +0000 Received: from SN6PR10MB3021.namprd10.prod.outlook.com ([fe80::c83b:812a:f9d6:b70e]) by SN6PR10MB3021.namprd10.prod.outlook.com ([fe80::c83b:812a:f9d6:b70e%5]) with mapi id 15.20.4888.014; Tue, 18 Jan 2022 20:10:21 +0000 From: Krish Sadhukhan To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, jmattson@google.com, mlevitsk@redhat.com Subject: [PATCH KVM 1/3] nSVM: Fix PAT in VMCB02 and check PAT in VMCB12 Date: Tue, 18 Jan 2022 14:14:47 -0500 Message-Id: <20220118191449.38852-2-krish.sadhukhan@oracle.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20220118191449.38852-1-krish.sadhukhan@oracle.com> References: <20220118191449.38852-1-krish.sadhukhan@oracle.com> X-ClientProxiedBy: BY3PR05CA0037.namprd05.prod.outlook.com (2603:10b6:a03:39b::12) To SN6PR10MB3021.namprd10.prod.outlook.com (2603:10b6:805:cc::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 68bbb1b2-d60b-4bdf-e313-08d9dabe8e48 X-MS-TrafficTypeDiagnostic: DM5PR1001MB2154:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C69lVsUXileP5B3MKYQz/j+SZ4wYBuhlKEYRZwrHkq2co7AO+S4HxVvnwNK2rsl4XDvmxBiHN94FDkN5HQH255TMzHWlUg6/30jBM3jCZxzmc/pdUmJROC9NKbUoZGEUe5OEULFNmF5vdQD/+f/oV402JKMJ+Stye3zhGUq+x0uR0zKdBo9MrGHIuoV1bRDxpkJYQo/s3BTfi1zM6xjbm1Y24rHLrb1Vk41aokqoPp4lrxW305o8lA0ezL6L/l9YGxoTbhkiu0w1T/d0BJOO3JqHPi6WRaB8WIyzO/YfH8e9VA82dCeA/xS5So+LQtXV9tqJR+PADk+cpgqPvh7h0XmW8/Lr5wVk1QsN7ZRYy+gKW99dxVcMSEOYw++YVjYNrSzxxjcHYryVq25N6LzSANUEe1IpmSCfZw1GkaAzL9b7lxXc5HgDrs8Nn32n1EhQiSKDfBF3g9XpB4V6NFy5Ok7E7kCNv4lPCqhZQzVORR44GXNSDmd9b27Hnrv92QuDHinp8QR8haeHWJNCO7EXGHQwWjG1eO3DldpI/1kSGU0kdNKSCp+p/lm0sTcYPL6az3xAUo4oJrqH5VENNwFY2iZad4wJgONug248kE5L5JQTjyWfscGMfKIlCidKAEBh6E60eEHDyoP99PJ07C4CggAtP8KTJTDRxrkeBUslELjgpW2Rt5QHcxlmJMY2DPP4JNAN+lAJfCt/goNpTS8v3A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3021.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(6506007)(83380400001)(38100700002)(38350700002)(4326008)(5660300002)(66556008)(8936002)(8676002)(6512007)(86362001)(66476007)(66946007)(6486002)(316002)(2906002)(186003)(26005)(6666004)(44832011)(36756003)(508600001)(2616005)(1076003)(6916009)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?niVIe/CZ4J8m0qUXEaqxket/wF/f?= =?utf-8?q?XimonDTnkAzLNIqmmkhMr0KX+xy5UCCxbeUIZut0oUc8yG5fgfjYyqgI1z+arrtqN?= =?utf-8?q?d71hOBeJMnMu2huvPGGuTyo4aLOPCG7f2jR8S77CKT6S10rVrtwRWoGcQXustEw9+?= =?utf-8?q?sQxfMGw5uv8k9ilZ523Qs664jweWQguz+aXliI/cVkAst6zsmj9XfA8KxqbEGUWDp?= =?utf-8?q?5VP8jBLHfdBFDDCDxhyiO6IkVZ9sjBTyWeMmPmn/NpbYca5em3iQPv4aqjkRB+E0Y?= =?utf-8?q?R95B/iCvIpT5KzEzz5eh2IBflsw57CfvaadWCBpkyWOy/8iXq86N8M7KOVO0RA3J2?= =?utf-8?q?cvvNe++Yvh0sSj/IX+91pvezRAEy49upwYPUHEUnGcG94t+cEAtDg/FlTqX0eCQrK?= =?utf-8?q?4MV6zm0kYh35jIg4sHQKLkoSaw3en/ssh/RO+BVJ2ydi06v81XsG9RPuDurOquh6e?= =?utf-8?q?b7rxB/MbjoJmIhEFK6kELaOyoWFP6AcJzIrOYauqo7PmhCmAt3sWfC/+8OC65cZIz?= =?utf-8?q?8YZuErIHG6dlD1IAmm2NbECAHbRqAzL58Yt2SFQG/pWaStDgMI39NUX2RcTP0FtlY?= =?utf-8?q?Z5XZARDokGmcZzjgLwPauphfu+Wl8w/k8FENUyCTHc14TlBPRXHvT531tmDEqcFrs?= =?utf-8?q?KONVn7zq2QBBd+AlIUjytaWlT0VXHaDCZWKpol7OCNHDSDwLDGiJ22xGTIY7Zlb7L?= =?utf-8?q?e5JeljewJidfhmUv9pIqyqY2w8v41sFUB6FrXpuLWWtmmXl3ZhQs+E3yDtBCCgSQH?= =?utf-8?q?uI+GLFqAxK4WvSjFSe5HIoR3LxxMUFzgbBC05tnQEcRDIyIUxAw+MKI268fb8jJas?= =?utf-8?q?JRGF97d+5xVRXEqNjAtmf+tw3AZob60rzA2CQFS1WLIVjAQwl5p2wSN50zR9BqHxx?= =?utf-8?q?KOTYQ9mSx7TYI/4Vv4mVqb3LKb07lT5UJ3IhmBQLZm/cE3hSAWRgkceNea4YxECxP?= =?utf-8?q?zaGm1WNh7xcGg8Cn+eqH2w/BG7VdeyvlnfTb5DTUhhRB2OD1XJFpbXYrmbFWO9/gx?= =?utf-8?q?COUHRAL/PBpqglKLtT/QjjGwrIbtgypJynDeLHn/XaaNR7mMfw+ZMmaasD5JJQccj?= =?utf-8?q?5ZFGEm8BwvpvoJhpUxzI5+DyVtwt+uP72rHbJ3V0arPDRnJLb2XTre8NdOA9aZZL9?= =?utf-8?q?xpABJyLXMsN/gJ1jX2fQU2ydLY3VfTShykwgnnKRcJ46KLBw0Vph6GMlnUYtmFitt?= =?utf-8?q?wr+miv0O9GwVrhmMDLBkYIGYS5A1eKv5klKs9X0Y44kl+OVi0SZ36p9LL7ZkPdFpM?= =?utf-8?q?c7SyNzaoi2m4/1bfN97QXXRMnGCnx8qc1kauXn4eH+lZw39tpvotFAx6FAGGa/MpQ?= =?utf-8?q?95VEus9DwKA4JMvCkIvhNW6kj7zvK35v4PKrk8i3G2a6aAieNvJmHEILxaWEdWnYu?= =?utf-8?q?F36ZmTnhH1xKXdunUQx/lWbw775vFpEPaegRxpKHVLOlJZqWev3or3tkIuQuW1kn6?= =?utf-8?q?dfOXfXnKL3TTk81fyuPHCIHY6INc0BxDSBzUuqf+Pa5mXHoE4XyqAiX69x61GD6+O?= =?utf-8?q?l8t+PvKkJG0XgTm+JzR/7zVynWqThunvko4WRAXOrz2iyPo/ga3I+8S5aU4GZk90a?= =?utf-8?q?mDCzsDtoCOT81o04TocJ3SEESkpK3g3ZA=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68bbb1b2-d60b-4bdf-e313-08d9dabe8e48 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3021.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2022 20:10:21.7449 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dgzMpRTTZraTrDPzAv8u1o+o4Uy3FzbwCJIV7oADKsmqqLuJurOAoEQ/+hD5e9KE59wpJNsylsM1Ww3u1x0Dzg6Q3HEXfx8Ibt/ZW4O1kD4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1001MB2154 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10231 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 mlxlogscore=921 adultscore=0 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201180119 X-Proofpoint-GUID: sJ7zDFXetK5yLLcppFUMElebsinBFO8J X-Proofpoint-ORIG-GUID: sJ7zDFXetK5yLLcppFUMElebsinBFO8J Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Currently, KVM uses PAT from VMCB01 when launching nested guests, as well as, when nested guests write MSR_IA32_CR_PAT. But section "Nested Paging and VMRUN/#VMEXIT" in APM vol 2 states the following: "When VMRUN is executed with nested paging enabled (NP_ENABLE = 1), the paging registers are affected as follows: • VMRUN loads the guest paging state from the guest VMCB into the guest registers (i.e., VMRUN loads CR3 with the VMCB CR3 field, etc.). The guest PAT register is loaded from G_PAT field in the VMCB." Therefore, if we are launching nested guests, the PAT value from VMCB12 needs to be use in VMCB02 if nested paging is enabled in VMCB12 whereas the PAT value from VMCB01 needs to used in VMCB02 if nested paging is disabled in VMCB12. However, when nested guets write MSR_IA32_CR_PAT, that register needs to be updated only if nested paging is disabled in nested guests and the PAT to be used is the one from VMCB12. According to the same section in APM vol 2, the following guest state is illegal: • Any G_PAT.PA field has an unsupported type encoding or any reserved field in G_PAT has a nonzero value. So, add checks for the PAT fields in VMCB12. Signed-off-by: Krish Sadhukhan Suggested-by: Jim Mattson --- arch/x86/kvm/svm/nested.c | 34 +++++++++++++++++++++++++++------- arch/x86/kvm/svm/svm.c | 3 ++- arch/x86/kvm/svm/svm.h | 3 ++- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index f8b7bc04b3e7..3283a58d5b0f 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -326,6 +326,17 @@ static bool nested_vmcb_valid_sregs(struct kvm_vcpu *vcpu, return true; } +noinline bool nested_vmcb_check_save_area(struct kvm_vcpu *vcpu, + struct vmcb_control_area *control, + struct vmcb_save_area *save) +{ + if (CC((control->nested_ctl & SVM_NESTED_CTL_NP_ENABLE) && + !kvm_pat_valid(save->g_pat))) + return false; + + return nested_vmcb_valid_sregs(vcpu, save); +} + void nested_load_control_from_vmcb12(struct vcpu_svm *svm, struct vmcb_control_area *control) { @@ -452,21 +463,28 @@ static int nested_svm_load_cr3(struct kvm_vcpu *vcpu, unsigned long cr3, return 0; } -void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm) +void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm, u64 g_pat, + u64 nested_ctl, bool from_vmrun) { if (!svm->nested.vmcb02.ptr) return; - /* FIXME: merge g_pat from vmcb01 and vmcb12. */ - svm->nested.vmcb02.ptr->save.g_pat = svm->vmcb01.ptr->save.g_pat; + if (from_vmrun) { + if (nested_ctl & SVM_NESTED_CTL_NP_ENABLE) + svm->nested.vmcb02.ptr->save.g_pat = g_pat; + else + svm->nested.vmcb02.ptr->save.g_pat = + svm->vmcb01.ptr->save.g_pat; + } else { + if (!(nested_ctl & SVM_NESTED_CTL_NP_ENABLE)) + svm->nested.vmcb02.ptr->save.g_pat = g_pat; + } } static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12) { bool new_vmcb12 = false; - nested_vmcb02_compute_g_pat(svm); - /* Load the nested guest state */ if (svm->nested.vmcb12_gpa != svm->nested.last_vmcb12_gpa) { new_vmcb12 = true; @@ -679,8 +697,10 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) return -EINVAL; nested_load_control_from_vmcb12(svm, &vmcb12->control); + nested_vmcb02_compute_g_pat(svm, vmcb12->save.g_pat, + vmcb12->control.nested_ctl, true); - if (!nested_vmcb_valid_sregs(vcpu, &vmcb12->save) || + if (!nested_vmcb_check_save_area(vcpu, &vmcb12->control, &vmcb12->save) || !nested_vmcb_check_controls(vcpu, &svm->nested.ctl)) { vmcb12->control.exit_code = SVM_EXIT_ERR; vmcb12->control.exit_code_hi = 0; @@ -1386,7 +1406,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, if (!(save->cr0 & X86_CR0_PG) || !(save->cr0 & X86_CR0_PE) || (save->rflags & X86_EFLAGS_VM) || - !nested_vmcb_valid_sregs(vcpu, save)) + !nested_vmcb_check_save_area(vcpu, ctl, save)) goto out_free; /* diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 5151efa424ac..e08e55082e77 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -2907,7 +2907,8 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) vcpu->arch.pat = data; svm->vmcb01.ptr->save.g_pat = data; if (is_guest_mode(vcpu)) - nested_vmcb02_compute_g_pat(svm); + nested_vmcb02_compute_g_pat(svm, data, + svm->vmcb->control.nested_ctl, false); vmcb_mark_dirty(svm->vmcb, VMCB_NPT); break; case MSR_IA32_SPEC_CTRL: diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 1c7306c370fa..872d6c72d937 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -497,7 +497,8 @@ void svm_write_tsc_multiplier(struct kvm_vcpu *vcpu, u64 multiplier); void nested_load_control_from_vmcb12(struct vcpu_svm *svm, struct vmcb_control_area *control); void nested_sync_control_from_vmcb02(struct vcpu_svm *svm); -void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm); +void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm, u64 g_pat, + u64 nested_ctl, bool from_vmrun); void svm_switch_vmcb(struct vcpu_svm *svm, struct kvm_vmcb_info *target_vmcb); extern struct kvm_x86_nested_ops svm_nested_ops; From patchwork Tue Jan 18 19:14:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krish Sadhukhan X-Patchwork-Id: 12716845 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEC3DC433FE for ; Tue, 18 Jan 2022 20:10:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348831AbiARUKa (ORCPT ); Tue, 18 Jan 2022 15:10:30 -0500 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:19518 "EHLO mx0b-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348680AbiARUK2 (ORCPT ); Tue, 18 Jan 2022 15:10:28 -0500 Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 20IK8KqW005474; Tue, 18 Jan 2022 20:10:26 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 : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=MiMtAkvFHrVUE2yjmkjFlz6qsYrFZUDe3s8BH+0nojI=; b=RACetixA8LLYxNGaq68SmbTD5sRIE0KCXv/m7PBbpxpDpmH268GA/H7UsyfDQbrolM5W vu+z7cYFc3ReQ2bDKw3KyP37zSYzLqq+bGvxOZJr8GGHKRgJCz8qMaHLLFhQ3grx1Yx8 GVfVQ33OZ/FmrQGa7onSTpRCTxdk0QF79A/hHDRG5TlabZ/9Mw3y/7KPaNBDdp3HaiBu TO6wEX7aNOufs4k+8gAL86lwoMk4EJ9jTOQ1o6VSlgqaIsmsoM9OPoIuJ+I9u/17c9Gw j68aSs1fcVWdTGaEzJVuW7675/5+2AuUK4K7mLWiNVxw7dSNCTTgHPIz47QimYBBs3Iq 0g== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3dnc4q33p3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jan 2022 20:10:25 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 20IK0PbV180361; Tue, 18 Jan 2022 20:10:24 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2105.outbound.protection.outlook.com [104.47.55.105]) by aserp3020.oracle.com with ESMTP id 3dkp34rapw-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jan 2022 20:10:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LPGy42RQHbSU2TfqFr0OaLmoy9Jm1WMA6tRlRYEtsTG97WIESbiE7ad3uFFaHtudkqF0q67U+6wqMnSvzwL/c+cm86emUgd8rqbqFRrdF4wL4y31IPZgBJeU4QQphVNjHFs8wzYQh36gyRH4ItsddG/rlDgQNy3SXUdd3TUqY8ULeCzwoOAx2ia/Vu05Vk2Ch7ScYpmURIm5/VeLnXc0EvL5T4LtQKSmVCqV0nvzYYza1fgevMKiKtKUS5ue7nBdn8XXgXoQJNgJSMCjhn7QvjJUyl3wC3oVT3D2rfpIJ3OK2tnzzeOMAUz5cgaJBqkuVSWMZTkwWC4B7cVlBVUh7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MiMtAkvFHrVUE2yjmkjFlz6qsYrFZUDe3s8BH+0nojI=; b=VQF7hbxT0ox9UlNMt1iuXmreNt4UQxRA0F1iVqgFwkkOqeVcJKNgTKWQUwqJlKrDyE6gH6Cj5a5//Pe7eJj7u+BfLeCmEaPpAk6c9Z6yohP2kuQeBSy553yIq5CQbGxDdUS309vEWoYB+Byat5k8TwKB2vdlih5xOKLmz4eTvK93GywpIbuCCTgwCCT+on9exmTmQQg4jDMVpkZ7jqAd0dRXccApcrB6Y3A7R1+T1nRlYcQnsFxawVs4WQEUYijenX9NHTGPyqZpx5wHfBz7u8q/MHDiiIbMEdU7TCPVvAEt3h+x9+O/VTCn50fNw2Ss6xZ8EWQA9yaIZECRPckCpQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MiMtAkvFHrVUE2yjmkjFlz6qsYrFZUDe3s8BH+0nojI=; b=YEkm3NdYs1ZBptIVne7ELRYBSEf3BMu49aNKJpzQ4nMgwzulxRYp8d1hypBmxvWbGnrhwPUMC726ZLlZJlK3iqi46WrRCIalGtw8aEuQXIAvya4amTuE99wyK6BH+Dwt613FBh2T6aIBSgqAVEoaqxWBr20Dd2J5R9IzvSXCSFk= Received: from SN6PR10MB3021.namprd10.prod.outlook.com (2603:10b6:805:cc::19) by DM5PR1001MB2154.namprd10.prod.outlook.com (2603:10b6:4:2e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.12; Tue, 18 Jan 2022 20:10:22 +0000 Received: from SN6PR10MB3021.namprd10.prod.outlook.com ([fe80::c83b:812a:f9d6:b70e]) by SN6PR10MB3021.namprd10.prod.outlook.com ([fe80::c83b:812a:f9d6:b70e%5]) with mapi id 15.20.4888.014; Tue, 18 Jan 2022 20:10:22 +0000 From: Krish Sadhukhan To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, jmattson@google.com, mlevitsk@redhat.com Subject: [PATCH kvm-unit-tests 2/3] SVM: Add a helpter function for checking if PAT is supported by the VCPU Date: Tue, 18 Jan 2022 14:14:48 -0500 Message-Id: <20220118191449.38852-3-krish.sadhukhan@oracle.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20220118191449.38852-1-krish.sadhukhan@oracle.com> References: <20220118191449.38852-1-krish.sadhukhan@oracle.com> X-ClientProxiedBy: BY3PR05CA0037.namprd05.prod.outlook.com (2603:10b6:a03:39b::12) To SN6PR10MB3021.namprd10.prod.outlook.com (2603:10b6:805:cc::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7912640b-f62f-45ac-8923-08d9dabe8ef4 X-MS-TrafficTypeDiagnostic: DM5PR1001MB2154:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:331; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tE17rurjSvXx4TqD0ldHtYex97zp9CI5MWf+WuiUS91QSzGqfZ7iv396WHhK0BTm/OhjcevYHEHBFPZJYvpiz4ByWUldNPhP+SqGGmdaxTKwIS2rDEMa1kDnkmImVjiamawh828oyQui9NKS5CASdYLtcOBI89aZ/nM79wHcW403hRf+sH7k51/Ht5UhLpaZTFG5PpU2Q+RR+ZrPOuGn6zhzP2/i0VlS8gjTXTmdaxnWv0H2AFyI9T4lFe+P+HtXR97bG63L+rSMG0kOpm/JHzTcZ63EIsZ+oX7Epj5EzolP6wLQmj+2nQCEbTEbfUQTiAI4xnMhN/mKX52io61LSrzYjPpeHQDnnhSK0YLURx3qFOCNcj6aFzwqonzopm2ZexTsL6fNpNiw3xRlr5+XL7r/IItRrWvjm3nJ+x6KHN0kRqSZd0Rgb5WkbB/sheZ04GcVcQ7T0gdEyRcz9F3SyvgKjdR2tnefkgXyMhF9Dq+JaIcsul6uisQGb2QG5mZtsDXERIXVtbLrxYqidrbwyp8AlMzNHoAH1+DpwTe1k8w76enWHeEzeQhY4Az9vgoHvFjlikjgG7v6xbqP9lTMz+EAQOQCPpccniAyl++c1U4tGJv7Op42zyUI0LfgpCqWlNyYJXlXeZmNdhsNAeY4X7Lx4GZ9IOleV1Z5XQoSA90/IVY1rm1+yR+QYIUk3sU4gNuWT7TBFw6nbOabhsMsaQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3021.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(6506007)(38100700002)(38350700002)(4326008)(5660300002)(66556008)(8936002)(8676002)(6512007)(86362001)(66476007)(66946007)(6486002)(316002)(2906002)(186003)(26005)(6666004)(44832011)(36756003)(508600001)(2616005)(1076003)(6916009)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n1Y7lOuwHjMNL4SqMK3xUayLLcNqDExuHutBCxZORE2AcHDxC5n9K6WIwnt5OCfH3y8l4Kgv2OVf1+FqUuIqkEEs4BwI2mU8FIIc7r5M3A2HJMTDP7CenMBhwr9XYf2QfHlEQzSiONyMAD+ckKycq0q4dGmeBtBzFZ6/qWnLuulbl83wlPLkCa/6fl9EUJM0Ka/ijLZOepiERBLzn22p7WJj/cvKu/0dmtb5l43fMPc6/SAIpkYLKyEhHhgBiOwDSov0g95i6xBH2BvOLdrZaMpaZ3R4Rm3eQ9rnUkEPQD5Z4JweAgizHSC+/TNeXPCUq5+QxLFbPOwyfKMS+BrL3h+Bm85x/4GPVhW7MPSd4zGynvlMQ9c/qrjehxs6g0Uk5TdJ/2yKA4uZX6EKOuJjNLQqvmDjvIcmq/eYcj7COCAju7YVVSy7+0ev7eYDugOgy4TL1FykVe6zsemWAQXsdyrFBryjKlDRmMCTDdrq1hqk9G4+pXaHiX5ve2jILFyDp5XvGKUOJCTddvibB4YU4PlthkdIvKQcHjdPmqMPoX4EtfWKbqbv3/5NJA1ZbFNk1RSH/Z/K9oeRYoURnrfvi5GdVAu5oKme6LtN9Wo91m0woX3E/isXmiHggWRq765zzcviinh5HoiwE7PFRzCmjenIudgps1t6LqO3LMnCWA1rhTmUp4i9wH9qmIZ0Th7RugZee1CH4dJ6ehYiPrdIveUZN+d2avBqEFJwOSGZxjCW1cSjr13ZP4NXap+CXLXKwfVzRWt7dIInaLneE5gtvTRzz8nzo1ei+ySWkZ42IEyaQA2IMbScwHwMYqL+/82FEFfws5YlUCTnrdEvOMk+lHTWGkbRtixbtnyGiqmYvkX1S7bYSDdZtE42TiSlniCrVxmO5+soThTPkqIW4Gq6/u2MC1gb6PP3X8SEZvTTIImtAQZi+Yy+ntsxTAreOISZpvCT2O4En6gPMWOgvc1iprluTO86ZDycuetBz7zDDxkCn8vF4+ouKw3iwSnPvHaqo/fUHXnhYTnYv3fN6iCG/buK5s8yozgwvGonih3nRqrEBeUdaIrQL4mse5NC/GmZf9XAeqXSR5YDVXb/9y7cvPd8IOW9EaShImH3dKA7YHYJ1V6R8lPagMTqXGCiZTvUemDlMlWi6+77CUn0u9zIus328wVs520ZY0vUsQXZsKSsJjs3rfNOYDpa73puTrFGYt6A8zfXRjniOb6wdDvDqsH9z5RdjszQS9hHYWSqWU4MVn30QRTLGLjiUD/YhFR+7idFhhz5azSUAvVdxyrRrc6sj9grTWFPsHyKtmSFuAwisLYBlpX78pnq8JJGM/XMnS/uD3T+KwkRtkCAWrHcuvq19dlfTzeRDf6/1UCCvQD8mBGudbpZDGkAIV9hpyNFLm6zVDYTvbLhYyESUaaNeBKjLLWKcROy3LaZcV7MWCPdTfdNsbyflNUQICt7NiQYukmB4nWAckHIG2t9hbEbsfPHv93eNyl7I3tFEi1pppanlR49cBBGUXU9A2TkGM5r6mZkLniwAbW4Met2mMjCwhK9AwQpFKwfP8w6bmaQzIdyK2HPZfbzJqMHBvG4lnXW6FALXlT/YOkCi5YQih+C2Haj7Tnd9rHcCTcfJjqYpV7Maxkc+PRtEMZiLykNxH+yBg7NwUqoobozYAcOXqAPaQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7912640b-f62f-45ac-8923-08d9dabe8ef4 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3021.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2022 20:10:22.8855 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iZGGJfJHOlgy0iWO1+z/OmEJMkwv73dEzaiXGz1DSmZJY5yPR3U7Xt+f/heEEtoOkrMatwPj81h9tl7gfjdMdZ/p7rxG+MMW45S5tWUziqE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1001MB2154 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10231 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201180119 X-Proofpoint-GUID: a2lFAhpQvkIF7pqA_76pBso2u1hQ4MgU X-Proofpoint-ORIG-GUID: a2lFAhpQvkIF7pqA_76pBso2u1hQ4MgU Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Krish Sadhukhan --- lib/x86/processor.h | 1 + x86/svm.c | 5 +++++ x86/svm.h | 1 + 3 files changed, 7 insertions(+) diff --git a/lib/x86/processor.h b/lib/x86/processor.h index fe5add5..ad892b7 100644 --- a/lib/x86/processor.h +++ b/lib/x86/processor.h @@ -180,6 +180,7 @@ static inline bool is_intel(void) * Extended Leafs, a.k.a. AMD defined */ #define X86_FEATURE_SVM (CPUID(0x80000001, 0, ECX, 2)) +#define X86_FEATURE_PAT (CPUID(0x80000001, 0, EDX, 16)) #define X86_FEATURE_NX (CPUID(0x80000001, 0, EDX, 20)) #define X86_FEATURE_GBPAGES (CPUID(0x80000001, 0, EDX, 26)) #define X86_FEATURE_RDTSCP (CPUID(0x80000001, 0, EDX, 27)) diff --git a/x86/svm.c b/x86/svm.c index 3f94b2a..d03f011 100644 --- a/x86/svm.c +++ b/x86/svm.c @@ -89,6 +89,11 @@ bool npt_supported(void) return this_cpu_has(X86_FEATURE_NPT); } +bool pat_supported(void) +{ + return this_cpu_has(X86_FEATURE_PAT); +} + int get_test_stage(struct svm_test *test) { barrier(); diff --git a/x86/svm.h b/x86/svm.h index f74b13a..d4db4c1 100644 --- a/x86/svm.h +++ b/x86/svm.h @@ -409,6 +409,7 @@ void default_prepare(struct svm_test *test); void default_prepare_gif_clear(struct svm_test *test); bool default_finished(struct svm_test *test); bool npt_supported(void); +bool pat_supported(void); int get_test_stage(struct svm_test *test); void set_test_stage(struct svm_test *test, int s); void inc_test_stage(struct svm_test *test); From patchwork Tue Jan 18 19:14:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krish Sadhukhan X-Patchwork-Id: 12716846 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBA4FC433EF for ; Tue, 18 Jan 2022 20:10:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348950AbiARUKb (ORCPT ); Tue, 18 Jan 2022 15:10:31 -0500 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:22822 "EHLO mx0b-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348932AbiARUKa (ORCPT ); Tue, 18 Jan 2022 15:10:30 -0500 Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 20IK8St4022642; Tue, 18 Jan 2022 20:10:28 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 : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=ruTt7IyJ4Bu3xxmAw/a3dbWcih2mr+cnIKXBGkWwIX8=; b=P5d7g0okhrP/2IDQKlmgZMVGNo1LI0jcn0585lI6H9DiLbUy1LNESLGSe1OGqB9HqBTD U1KOpgfmuPBLCyvKi4SumFxYi6boyWeIexKJvM+dIYDH7Jx7Fwab/tEGLv3ZUoeLJHtH HJnwaYDkGxHOSefO+OLQnnL9i1FRmn/lSZWmARC4hhndxbMG5kII5peclLDVogZHBKZb klKd/TOtuBEgCf2qY4Q8aSiwGwhLOYC3h/uZYyHCbejpOV7i8GIq/M9qXzkB8q2Ca2CJ MnAfngL86FBDkXQ6DOEqQC69lZHpTNmd1D++TrYKiYEN9l8BEF5oa9CB/nzvWw5t95Gh QQ== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3dnc4vk2p0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jan 2022 20:10:27 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 20IK0PbW180361; Tue, 18 Jan 2022 20:10:25 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2105.outbound.protection.outlook.com [104.47.55.105]) by aserp3020.oracle.com with ESMTP id 3dkp34rapw-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jan 2022 20:10:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N5x7fXLw/tw0XQADbryPEHLs+FVavgQ8IxB4mlJ+YEwFD/Iaj8Z0VverE0KO4/1Fp15A4EHts6CP/3Xl1fzcyarp88YIP9Ay2Sg9gj87FdZ1QLsomLVVYClHqZQkPEiKJrpnVVdRHHqdf5tlzE2JROP66qYuD//UNrtIz6sq/GY2rVNB1vE0yCRjw+icfiBC3qFfATe6Myc6FI7tTEAr1F4jhjGCw4LNTg8Uji3EsPoyRwNN2OWUjCbT2KM0XaSzcHnmCGuPkP6e6SveF+SLGgRxd/K0ZZbGPdshEBSVYpG6VtXBodKbruaeF4URymb9BVw4XSu8LKPyMdUTGWrV5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ruTt7IyJ4Bu3xxmAw/a3dbWcih2mr+cnIKXBGkWwIX8=; b=CJZmZdWiRBVbJAORfBwgnsXUY+Kyb06kFsLNOVHM+lv1wPchhvvhSkTUdzojcp88yz1WiVf91uKSQdKncxpKCau5vqhNuIzEx4r3uTNMBoFvS5FthZmlA1BSv9pieUTmtrI2YobCiFB24NwCH2IH1/1ILyhZI5ne21JvuhaK0lvOG0Nz4p4l7yeEstvqiWxte9/tbmwBLcx1e+/eEEdyYupP1CVoLdMurzP9IJirbj6ztlB9gdlPVtg7oHIAo1AXhahf92MotDfvV2Giz5+pLOL52FEU85EHgAouOOZv1F3N+jWhXGYHAbyUBRaPd4d8gOyX7g3DrENkQojPiz45LQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ruTt7IyJ4Bu3xxmAw/a3dbWcih2mr+cnIKXBGkWwIX8=; b=oPFhzJkLx0ih5zX0MlnhlNwNRg+0bBuMb7f87idhWFjp6MzPaSZ/AxaipvnMrPyLZmO98APHKHBCtGLBnKuvWmDFP7Si4vWtmfZCcgLduPv1xr3KzHwM+v4iKZI97IKp37TQrkmU3dLnIXoZAnJnQZv0WnGfBnr4WnNx9tZZT14= Received: from SN6PR10MB3021.namprd10.prod.outlook.com (2603:10b6:805:cc::19) by DM5PR1001MB2154.namprd10.prod.outlook.com (2603:10b6:4:2e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.12; Tue, 18 Jan 2022 20:10:24 +0000 Received: from SN6PR10MB3021.namprd10.prod.outlook.com ([fe80::c83b:812a:f9d6:b70e]) by SN6PR10MB3021.namprd10.prod.outlook.com ([fe80::c83b:812a:f9d6:b70e%5]) with mapi id 15.20.4888.014; Tue, 18 Jan 2022 20:10:24 +0000 From: Krish Sadhukhan To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, jmattson@google.com, mlevitsk@redhat.com Subject: [PATCH kvm-unit-tests 3/3] nSVM: Test G_PAT fields Date: Tue, 18 Jan 2022 14:14:49 -0500 Message-Id: <20220118191449.38852-4-krish.sadhukhan@oracle.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20220118191449.38852-1-krish.sadhukhan@oracle.com> References: <20220118191449.38852-1-krish.sadhukhan@oracle.com> X-ClientProxiedBy: BY3PR05CA0037.namprd05.prod.outlook.com (2603:10b6:a03:39b::12) To SN6PR10MB3021.namprd10.prod.outlook.com (2603:10b6:805:cc::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 709e7cde-c900-4460-918b-08d9dabe8fa2 X-MS-TrafficTypeDiagnostic: DM5PR1001MB2154:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eRPdUQmViA0m6+AZFBQp0WsmjgidWz/77B/ZI0qAMrVUAFkCNmX3FBhPP+BxbBqXi2uTyiQr0uNpfEA13LdvlHzj7/nkWLmUB2B13sUfkRqrkQE7EzoHKscDcKLXDNLCvOR1vXZK0SO49LQ/vptiauaC0ogQzhhzqQ/Sn3UeMcJSQAV/cBQeUYXvcuodMD0RCflw0J5ytGkk6A4X0i0ewcAe86GolAfz+VsmlHx3cffhh6SLgqf5BF773YVvSlUocHUdkRNdxChuBwOy0zyrNDpicjI9zmxfE1DdXU2uO8yNiwhLvCmfZ+Bij8QzVjjVStMA82FcBMBc9H3Z/hI/SYbxxhb+Qad7GjNNNOKKZTpgZP2Ml4R7ODU35rU5fcU0c0bd6UsnB80CK761T+kjeWGoDHGwfdj78/gLs47e47SLUY3DnY+SSFJtA3tsvztpX50Di1JyxgtqaQYCcHV+13ZuPbHQqrUHFd/CEr43BncDwlOF/r6wV8O+Jz/r2RDML0+tbmAglCoM0QS7uSuuCBXnbr5phYX+QMuPD+J9wuGthr8lQc4mhlluIkrGe0k47rbfYUnge2CxZE3GxWTRXwERriGUfSpkhmRR5k9iCvMN81njxV5nzKLO7WKmyyhIz6cWSLrAN6rCPKbS0CdaTu63eNHwLqQ1N924gNzghttL+ZijvM/OuiW7/eTX1Gk1iKT6Vt+4/HhXH2hOP9Ni9g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3021.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(6506007)(38100700002)(38350700002)(4326008)(5660300002)(66556008)(8936002)(8676002)(6512007)(86362001)(66476007)(66946007)(6486002)(316002)(2906002)(186003)(26005)(6666004)(44832011)(36756003)(508600001)(2616005)(1076003)(6916009)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kNsM14+yRSdvtKKYbW9B1kunAXlHv60/C8LuieHMDMfF1PL6/3AGtyz0NneAyY4AwbzCfHXNJZ30vGYTkIXiC/0I0iOgKSibZWcF3HqMSoVcwvAa2+yaqIN/8D6kRcPlVMtTthFvOCaLoLQ7KEN1I7FFY27gVsIyQks0vWlFvsQG6CUXuHoRPMoTHtJfkCOAJw02KB40YqGkM4mefgjyFModfQ1kyeZ50rjqWyyVNwlTLreuS4eJoiqCosqvBASkscTMd3/whgDoe2NTi9UEReSdAb0IBnBv9YttJ/MmXKUEl4JV9EYHtx6JoFvfMPRg1VZv/xqK5tZorRKtFvwuOlG2a+09LPfIMz1NFUJ5nzSYtbqzQGKbkmXq3XlKvGK0+dIoDu4RV+pZRQqjBLS9hRuwG+fryL91Ett625NU6bQwNxTajeZvbPHCC+UMuWXnNogz5hFcD893VSbODtmFh4VEYX3EScj9Ribz1k1e/VBJqnoG9kJlwXsLGW1UXpW1vqXfROEengWmA5ACHOHpju+ujRzRbZd28iqmBLgT6hvKrZTyI9rmYmEoU7zWfS01Cue/zpIBAECkq+M18/GQSAVv0UQgBV9O5MPsPuHM+rq12i6KrGvso9XlZRQ+l6AHSZsUHgIc4GvAV1/bfvrXDXhrHhiFDSVIYBxOKm5YmG9rxI9esN0j6PnqQsNqS6mPGSJbiUF3FvN3zkbPXgsfFJ/9fJC843yjuFIOKtFI4ypaSVw4Iuto2gZB8crLE/ERGJ91RQYwgE80SazimEI4wv8K+RK+fTUd0J6dvdTqJsASPbssay2upJqfczylj2NgVeHxYPF97gcrwg5cUUVX+mBqSSRJNGSGO8kxLC3a4EhgfF1dJpTAycyi5rrOvwH+e8q1C0VCAnsYEBwvgPMVq5qjemCKrVi9Ef5sMRvCWaWuOyQttewr8jq2zzHFiOh2qbdOd3WXiiUAX4ReHCyU7PFtUuFCr2UiFJ1fmED3xDjcKwIL+yG5mTG0wbvrZ/khlCuknDYXBd2qLxmkIT98lf/BmZ8LzXRAWKZOK6ED2ZXwgrdBYLDohCdxS4yg3Wok/wzhcXpTrO5TE3eOVxu/l07/3rE7a38uCHFGn5AYBssw8vPyK/Z2y8AXWzunCgE0BwvA6FJZmiul9cD0YwskebOKvnbGaXkQQcm4/sLrk0jsGGGu3z1si4QxZS1JB4uh5/W7+hRiK3ojnDYCrBfaXwwyI/o1eRTjfb0egz7m/ClkMcZFV1cp+WsVoju0IsfrdzXd6AiomFEXeu6UZhLMUveLklBSYvg5qH51AdJaimSugatcVJu+TmJuVt+63mWZNony7L4KIOjgCuxrUdf8M58R7qOJAz8X/RlyzpHYfABFABkjOB03Gxw2BW83QKrK8qdQaizrPw32mv/4BtGsZZUNFsNmNcyRC2QUa34hxML/anLTtLP5Quk64Um5yAONRqM87eVbnFQIcGsLLObFsjD0djdsTxikXLNsQuVsAfR2jflt4tagq+UpBNyGwoAX7fu8Z7802+KIfCB9y+w1m94K0/46mcRGphYwMK06RRye3wYGAAmxNSkuUjgh5YayNkswpz1uqNNhhorUYeJQ1PBwhTKVivANEVH7hpeH6Okngj6Lz4vETZTS+8d7sx7X6WGdjyWxO64jDmaheCttoQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 709e7cde-c900-4460-918b-08d9dabe8fa2 X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3021.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2022 20:10:24.0104 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: j15ohivZX8k548rZcYNnF1T+LCy/uJGyMrV7bLkQcdE3ErMJxp19ivMgkeMkuQWJ/U+BC2PTlPuYworV8mb8o4e/HtHYdh/rgbfIbBEGjUY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1001MB2154 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10231 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201180119 X-Proofpoint-GUID: uCaJAirYPKwxfg_zsqMFxqPcaJsQVkSd X-Proofpoint-ORIG-GUID: uCaJAirYPKwxfg_zsqMFxqPcaJsQVkSd Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org According to section "Nested Paging and VMRUN/#VMEXIT" in APM vol 2, the following guest state is illegal: "Any G_PAT.PA field has an unsupported type encoding or any reserved field in G_PAT has a nonzero value." Signed-off-by: Krish Sadhukhan --- lib/x86/asm/page.h | 11 ++++++++ x86/svm.c | 8 ++++++ x86/svm.h | 1 + x86/svm_tests.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+) diff --git a/lib/x86/asm/page.h b/lib/x86/asm/page.h index fc14160..9ff9329 100644 --- a/lib/x86/asm/page.h +++ b/lib/x86/asm/page.h @@ -57,5 +57,16 @@ typedef unsigned long pgd_t; #define PGDIR_BITS(lvl) (((lvl) - 1) * PGDIR_WIDTH + PAGE_SHIFT) #define PGDIR_OFFSET(va, lvl) (((va) >> PGDIR_BITS(lvl)) & PGDIR_MASK) +#ifdef __x86_64__ +enum { + PAT_UC = 0, /* uncached */ + PAT_WC = 1, /* Write combining */ + PAT_WT = 4, /* Write Through */ + PAT_WP = 5, /* Write Protected */ + PAT_WB = 6, /* Write Back (default) */ + PAT_UC_MINUS = 7, /* UC, but can be overridden by MTRR */ +}; +#endif + #endif /* !__ASSEMBLY__ */ #endif diff --git a/x86/svm.c b/x86/svm.c index d03f011..c949003 100644 --- a/x86/svm.c +++ b/x86/svm.c @@ -94,6 +94,14 @@ bool pat_supported(void) return this_cpu_has(X86_FEATURE_PAT); } +bool pat_valid(u64 data) +{ + if (data & 0xF8F8F8F8F8F8F8F8ull) + return false; + /* 0, 1, 4, 5, 6, 7 are valid values. */ + return (data | ((data & 0x0202020202020202ull) << 1)) == data; +} + int get_test_stage(struct svm_test *test) { barrier(); diff --git a/x86/svm.h b/x86/svm.h index d4db4c1..d4c6e1c 100644 --- a/x86/svm.h +++ b/x86/svm.h @@ -410,6 +410,7 @@ void default_prepare_gif_clear(struct svm_test *test); bool default_finished(struct svm_test *test); bool npt_supported(void); bool pat_supported(void); +bool pat_valid(u64 data); int get_test_stage(struct svm_test *test); void set_test_stage(struct svm_test *test, int s); void inc_test_stage(struct svm_test *test); diff --git a/x86/svm_tests.c b/x86/svm_tests.c index 8ad6122..4536362 100644 --- a/x86/svm_tests.c +++ b/x86/svm_tests.c @@ -2547,6 +2547,71 @@ static void guest_rflags_test_db_handler(struct ex_regs *r) r->rflags &= ~X86_EFLAGS_TF; } +#define G_PAT_VMRUN(nested_ctl, val, i, field_val) \ +{ \ + u32 ret, xret; \ + \ + if (nested_ctl) { \ + if (pat_valid(val)) \ + xret = SVM_EXIT_VMMCALL; \ + else \ + xret = SVM_EXIT_ERR; \ + } else { \ + xret = SVM_EXIT_VMMCALL; \ + } \ + vmcb->save.g_pat = val; \ + ret = svm_vmrun(); \ + report (ret == xret, "Test G_PAT[%d]: %lx, wanted " \ + "exit 0x%x, got 0x%x", i, field_val, xret, ret); \ +} + +#define TEST_G_PAT(g_pat_saved, nested_ctl) \ +{ \ + int i, field_shift; \ + u64 g_pat_mask, field_val, val, j; \ + \ + for (i = 0; i < 8; i++) { \ + /* \ + * Test each PAT field's encodings and \ + * reserved values \ + */ \ + field_shift = i * 8; \ + g_pat_mask = ~(0x7ul << field_shift) & \ + g_pat_saved; \ + for (j = PAT_UC; j <= PAT_UC_MINUS; j++) { \ + val = g_pat_mask | j << field_shift; \ + G_PAT_VMRUN(nested_ctl, val, i, j); \ + } \ + field_shift = i * 8 + 3; \ + g_pat_mask = ~(0x1ful << field_shift) & \ + g_pat_saved; \ + for (j = 0; j < 5; j++) { \ + field_val = 1ul << j; \ + val = g_pat_mask | \ + field_val << field_shift; \ + G_PAT_VMRUN(nested_ctl, val, i, \ + field_val); \ + } \ + } \ +} + +static void test_g_pat(void) +{ + u64 g_pat_saved = vmcb->save.g_pat; + u64 nested_ctl_saved = vmcb->control.nested_ctl; + + if (!npt_supported() || !pat_supported()) { + report_skip("NPT or PAT or both not supported"); + return; + } + + TEST_G_PAT(g_pat_saved, (vmcb->control.nested_ctl = 0)); + TEST_G_PAT(g_pat_saved, (vmcb->control.nested_ctl = 1)); + + vmcb->control.nested_ctl = nested_ctl_saved; + vmcb->save.g_pat = g_pat_saved; +} + static void svm_guest_state_test(void) { test_set_guest(basic_guest_main); @@ -2557,6 +2622,7 @@ static void svm_guest_state_test(void) test_dr(); test_msrpm_iopm_bitmap_addrs(); test_canonicalization(); + test_g_pat(); } extern void guest_rflags_test_guest(struct svm_test *test);