From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.74]) by mx.groups.io with SMTP id smtpd.web11.9747.1602346056643230342 for ; Sat, 10 Oct 2020 09:07:36 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=ASH+JVjS; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.243.74, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W9PGgLkXYMvVTGZrofgCJA+7yqegmU/2Wf6KFtfz+dI77ZPuWKFiY0tKCsYlpgDO9Df/bUeZN8XNxe+D7JI5niFltRFx1LAAGsCTmF9iyaWYxFsl1Jv69hRU2tOJpBvBZxRTaa0Qvk77xnpnQ+GTTJVKzDDlrvZG98eJ4uFO8atjlL5a6VkD18OonoAGxFzUNgIG0bJdbueU7C0DdmfGz6pZptiM+SWd4QLppupAijuF7ByMAl+gAkvWHDRYzYpdwO1/aeeJcZvwA5hGxaUwlfnJpI+q2995jNOjPhi1yN8r5gtj1TPrvOa/geKAvv8bE1T44DDeeXxNQsDAhslAHg== 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-SenderADCheck; bh=6K/VeQTzWQKcvAdYO/HjNZmJPx8yAJjXGZANXE/G3H8=; b=JyFkFxGTG52rybz0/wrr9daZEiB0IRie9vw+WRwDlfaPai7SbzD/aTeRLnzRfOJ8e//X4Hz6DKWs/NpsAo5VTHX/J6TD735aYrzbr6B11wcRX5xeipKaU0Ar/tuDhrpnR5KJjo04kpOfjZPy+tYBPOwWyKdn/nqGPWGiXQzlXh4Mtr/M/SRyNnSXGoT79ZZRMa/aMcAR/hJAEkhR2HZBbBjEPD02wCEK33Il1S/rz500f1PZ6Rj91WENGGXbQu1L2JdCH/eY5otZ5qJBx3B+kiJFJ24SaRXpmt+FoiQuAfiDWNi4Fk9H+5xyUG/grT8Fb3NIBWXb9iA3LsVwQf/JjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6K/VeQTzWQKcvAdYO/HjNZmJPx8yAJjXGZANXE/G3H8=; b=ASH+JVjSzUtTz/hV0yFJtM7gGCq/wUYww0/FZXMT9hONZgfnOrMTKRpmpQ5yOp4NL9e93mtcZEYaLGLbK1X4kQ5IZBMrFt5iFj2dgRfvzJS9xY/1Ry6y3KBuazg3HH/Et4osekaHZLQ2mjo2sv+lyXOokjrsGULDF8wvR1udu7A= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=amd.com; Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM5PR1201MB0122.namprd12.prod.outlook.com (2603:10b6:4:57::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.28; Sat, 10 Oct 2020 16:07:35 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4d88:9239:2419:7348]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4d88:9239:2419:7348%2]) with mapi id 15.20.3455.026; Sat, 10 Oct 2020 16:07:35 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [PATCH 2/9] OvmfPkg/VmgExitLib: Set the SW exit fields when performing VMGEXIT Date: Sat, 10 Oct 2020 11:07:00 -0500 Message-ID: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0401CA0002.namprd04.prod.outlook.com (2603:10b6:803:21::12) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from tlendack-t1.amd.com (165.204.77.1) by SN4PR0401CA0002.namprd04.prod.outlook.com (2603:10b6:803:21::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21 via Frontend Transport; Sat, 10 Oct 2020 16:07:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1b7da30d-90b6-4637-0e7b-08d86d3699e1 X-MS-TrafficTypeDiagnostic: DM5PR1201MB0122: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p8XBZ6glw+QAwX8xne5HdR9oXzT1wqjfqfviT+TgblTsiXCfW1EDLrgo8CciJsZJzdT10DjS2pfsNDxb0KrqaOqpkKMblynZxlntGdEsP671KnmP6LV95fZYZxDG++ps9bCT/clnZrYSz0SiF5XkWOW7HVwt+DBqv7hUm231ixjANWIkkZNxrnuH0xK2r2EjskrQD6IUpbHNN+RKnPs4BLEOhBwLPC0IDKUgxTF9zT8wW4WyQFzrRO9rTrpZN1u5riTBEmmKNTdz3v/A47lvw6RW1DKtoaxp0wX6UV/Jqq1vt8rHoKk0GZ0qzzugjwK/dk8Hq9nsyV/wl9yFigNlbA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(39860400002)(396003)(346002)(366004)(376002)(478600001)(4326008)(6916009)(2616005)(956004)(86362001)(26005)(54906003)(66476007)(316002)(8676002)(66946007)(6666004)(66556008)(52116002)(5660300002)(2906002)(83380400001)(36756003)(6486002)(7696005)(16526019)(186003)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 9U6vjRhYlwINUzxM2HnK2u7X1dt8GrtRrgN3/wu2O0ZcPvldd4FBS17U5EpsEcIcXVPrpCvJ99egXbUmnsDgXlQUn9s7jVoCRiTZuNbSOQntfw2cCtn4KT8JElWGlinB9KzYL7xDY72EmfGI4J0gdjP9lQ+jsgXZZ/2VvwuCjbH98Nz8Id3bZdPbXPqUED39rrB42CPxU21ZY6cRhHRkFboB0KlQcfp/2WAyCiBPT5d9fSoLIu91biSbxoLQXXayZWccG0H3dAhS3G1J9qKPZIP6iKeBxhuXJ4UMIcmWTERI1OnnLimJNyHke7+72SRDYX2oiaN4+WsSoMq1GpHZ7FI55s0Y+xNuVw6jxz/oVs77Gaol5Uw9TS7pBuEomgFfyB8xdpT0qJUfwQJJeLEezo/ICNtlwi+FJC8SuqDx1qHPKvCCh7M9j7pS/ExWbwG6foFPt/5AJ0OZXIkHTwkMNh+MFMszw5roWoSxlwaM6ALODrmxMHwJy13ayTURAHED2aP9qaNAi5ajx9bS5E94F1TpoYnEwYocZBVYPqiz8Y5BeOJszfASfKGmNW0id3pJfg1awtPovbLI7IAzSCKhwaYK9dBnTToDLqe0XYtmt5hPqw7BuaKjo6gp/0n8WyfBIK4x1Tkl2owwAq4wEXQm6g== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b7da30d-90b6-4637-0e7b-08d86d3699e1 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2020 16:07:35.2329 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /tH8CS5/AaUTuxvSEsSoJ7XWYsZ4eZa6UJgiU6u/xlDiD8JtTHm5Gww9cPa95ZMWUOlXKe65y8xbTBMKW3AxQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0122 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky All fields that are set in the GHCB should have their associated bit in the GHCB ValidBitmap field set. Add support to set the bits for the software exit information fields when performing a VMGEXIT (SwExitCode, SwExitInfo1, SwExitInfo2). Fixes: 61bacc0fa16f ("OvmfPkg/VmgExitLib: Implement library support for Vmg= ExitLib in OVMF") Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Tom Lendacky Cc: Brijesh Singh Signed-off-by: Tom Lendacky --- OvmfPkg/Library/VmgExitLib/VmgExitLib.c | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/VmgExitLib.c b/OvmfPkg/Library/VmgE= xitLib/VmgExitLib.c index 53040cc6f649..6cf649c6101b 100644 --- a/OvmfPkg/Library/VmgExitLib/VmgExitLib.c +++ b/OvmfPkg/Library/VmgExitLib/VmgExitLib.c @@ -78,6 +78,32 @@ VmgExitErrorCheck ( return Status; } =20 +/** + Marks a field at the specified offset as valid in the GHCB. + + The ValidBitmap area represents the areas of the GHCB that have been mar= ked + valid. Set the area of the GHCB at the specified offset as valid. + + @param[in, out] Ghcb Pointer to the Guest-Hypervisor Communication Bl= ock + @param[in] Offset Offset in the GHCB to mark valid + +**/ +STATIC +VOID +GhcbSetOffsetValid ( + IN OUT GHCB *Ghcb, + IN GHCB_QWORD_OFFSET Offset + ) +{ + UINT32 OffsetIndex; + UINT32 OffsetBit; + + OffsetIndex =3D Offset / 8; + OffsetBit =3D Offset & 0x07; + + Ghcb->SaveArea.ValidBitmap[OffsetIndex] |=3D (1 << OffsetBit); +} + /** Perform VMGEXIT. =20 @@ -110,6 +136,10 @@ VmgExit ( Ghcb->SaveArea.SwExitInfo1 =3D ExitInfo1; Ghcb->SaveArea.SwExitInfo2 =3D ExitInfo2; =20 + GhcbSetOffsetValid (Ghcb, GhcbSwExitCode); + GhcbSetOffsetValid (Ghcb, GhcbSwExitInfo1); + GhcbSetOffsetValid (Ghcb, GhcbSwExitInfo2); + // // Guest memory is used for the guest-hypervisor communication, so fence // the invocation of the VMGEXIT instruction to ensure GHCB accesses are --=20 2.28.0