From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.61]) by mx.groups.io with SMTP id smtpd.web11.9756.1602346080563250529 for ; Sat, 10 Oct 2020 09:08:00 -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=nZFejZIH; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.236.61, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RPohHryA2fbv3pmaJH2GCADo122Pw9Ek4tRmWpEozTF9WJ1NvFfZbSl/zOIVWfPhx8H5wX3wA+CKgo4zPm+0WkClyeLaflCfGKlUxU8HN7cef30Nj9XoHro3w4D6cGDDFDI310QHGFhieGPn9/mpOFl2vhWHBSDE7K76GriVNPuH48SZs5rXOTUuQvyPwDDMPEjm2lL1P8OTgC8eTDi7DXkhLiRdjJ6AGhCtqj8Iu9rjVwQ5doVIEWw5/Hc5hyqWaZbJAxjSVOWD0HMqpBBm5ZeI46FwvSnSGv/tVbbC4YTEgAtrRmTfcbcxWSWu5oFEfZZGUx1f70Bsz0pxiwguGw== 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=YDWSZVPqGtaROeShxydZVGUgvwykwDUoCraolw+xenI=; b=LIu/SbqyxqEsPOoEHVEmlDglJzsCQxmevYgu36D4PqkMI0ZZaCicWFrcBnyEim6/kmC2pW7Z9zkdhDXmir+CHtEvj0awsucm5qIuujVCWoNUTmrPTWDYo8PNS6HKb/ASKPkt1CKyyYroSe3TmsBbdjYsaYj88DWJIpDJcAE26ybx7LCAGnxIjjJJ1KZnIt9kqBbyr/M/d2pa/HqgIrtCyCI1xB14rpG7XPwh3U33U49Mhp0d0Nik12Kvp4HiY2wsoRjyBGWDlAjnhz0sC9IzpoL1Aj6pLImzReqA+sTvbAkrth1QPlsR0YKOo0l/AFiDWlpYpLuf8/wBeSyI4yFmPw== 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=YDWSZVPqGtaROeShxydZVGUgvwykwDUoCraolw+xenI=; b=nZFejZIHP+sKocEG7oH1kWcXCIKsB5i21+BC55jYWCXmk6aDIhkUQdWSrvndytAV/NsScrnblzc9ZOz2DxCxkBndFb7Yhp0K+y65bKcbzLHgWQFBEyPH757zr1lLhYaT+Xe9nZ3Po59JjDgw5siecLirbpFUx0qnYUh/32ONwoM= 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:59 +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:59 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Eric Dong , Ray Ni , Laszlo Ersek , Rahul Kumar Subject: [PATCH 5/9] UefiCpuPkg/MpInitLib: Set the SW exit fields when performing VMGEXIT Date: Sat, 10 Oct 2020 11:07:03 -0500 Message-ID: <2c01c358aea038dcc09eb1b46af19fc1278adb93.1602346027.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM6PR11CA0027.namprd11.prod.outlook.com (2603:10b6:5:190::40) 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 DM6PR11CA0027.namprd11.prod.outlook.com (2603:10b6:5:190::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23 via Frontend Transport; Sat, 10 Oct 2020 16:07:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d7b35ef0-681d-43d8-fc1c-08d86d36a804 X-MS-TrafficTypeDiagnostic: DM5PR1201MB0122: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RHDz/4Yw55flC4nIVc9ypqE52laQqHqkRODZ8e2TOmLP1TooIUxwuBaK7Of14/Mop9oWmJLCJM0ykF+/HTsKMmKvRdmbvGN3pdw10k93UjKdD7ePIJbV4wxXNOJu69Hjk9bnbBE7+dq/Ca4GZA8SO2V6BaPIYcUYgVPklZ/x2MaL+8Qy3RJFLnMe/DtxJVdXALttkXi1HzPXfbC5LxMbNrDwuc31BKAt1MlGFGWO+sFPMB4HqD9QgJ7YjCdOYtYDr+t7EJgiuoNf3kbUFreXx3eg3iNyCcgsTSVzZBfTcOYGR+c8kTTJsFsMFocT06htZBpkOgQrIjPfXKaGEKU4+g== 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:(6029001)(4636009)(136003)(39860400002)(396003)(346002)(366004)(376002)(478600001)(4326008)(6916009)(2616005)(956004)(86362001)(26005)(54906003)(66476007)(316002)(8676002)(66946007)(6666004)(66556008)(52116002)(5660300002)(19627235002)(2906002)(36756003)(6486002)(7696005)(16526019)(186003)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: GN5Sba5Kh4boVtJ473bPtp4AFnQkySspBWdkxBG8JPrNjfVW6wTXyXfW4IqSNk5Q+ywF9vbCHcfd4lY0/MajL5zm1smk8SfPrwxvgQXGpzKPb2t1UIWwnUzHpecMP4CdWc63HyeNKgNfNDbXXSGIgXvi/e92mEmsed83ZBC3ur1hizw3N1EyfadoX9AK3aiRu5SkR5ADBCF95g0cF91iMv9IBD/pVZCiDIAKhfV4CzYfWy0So4Q+wG4/nZfO2a2mh5VKg/4+b8ltMC7/obN6iELuw3YoSDfFEYlbwuKR3uAkehBv/axoomN7wT4gorbrQC5y5ySOT+aawunZPGlWIOltJdsD4NHtF1Qfz2hSEw1ATlZtjt/zWbFPiWCDRZIQQUqOEukSoCsFVFz4KPJLHg/1zkztDmGRc/lKOGK1UnDUsOnEZqNnHqnkPbWuQ2mecTGa30u5fwXPG3XshwS9tv273V5kZpkC3HjXLYGWvVIuHI9O3WZ+rMMYdLJgQSuwaHwjREGmivHECzhZK7huPW7x5Q7V32prfK6ePBmmgGi/cZx2utL07wtuIoOVOwho7wsSy7y09SCrd1C5RAqgcmMDIf5NqhCi8Rf/yDVG++FTNWINGO0hOA7+C0t3hBivxfgyRzvrJ+8Lw4x4hJXH+Q== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7b35ef0-681d-43d8-fc1c-08d86d36a804 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:58.9394 (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: n8lH6a3sGOL2yHSo2fN7zVJuwcBkxclv9yzOgK6Y2JIdDcSif+2HAc/FE4r4DDPTvP8iRb0tQ44994zXXrjA4Q== 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: 20da7ca42a33 ("UefiCpuPkg/MpInitLib: Prepare SEV-ES guest APs for OS= use") Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Rahul Kumar Signed-off-by: Tom Lendacky --- UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Lib= rary/MpInitLib/X64/MpFuncs.nasm index 5d30f35b201c..5532a1d391bc 100644 --- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm +++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm @@ -533,6 +533,12 @@ BITS 64 =20 mov rax, 0x80000004 ; VMGEXIT AP_RESET_HOLD mov [rdx + 0x390], rax + mov rax, 114 ; Set SwExitCode valid bit + bts [rdx + 0x3f0], rax + inc rax ; Set SwExitInfo1 valid bit + bts [rdx + 0x3f0], rax + inc rax ; Set SwExitInfo2 valid bit + bts [rdx + 0x3f0], rax =20 pop rdx pop rcx --=20 2.28.0