From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (NAM04-BN8-obe.outbound.protection.outlook.com [40.107.100.57]) by mx.groups.io with SMTP id smtpd.web09.1126.1610045444332981723 for ; Thu, 07 Jan 2021 10:50:44 -0800 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=GN2PrnIt; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.100.57, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kp6GLJslJCRnY1jvBN2rXXy4e7cmeSRlii+KJnSKNal7Oyuuxi8t8M7X9Lh47XGWOGkKjNBcGcDRwee3WSWFNUfcqIj9dsDpfjx1aAsvS4Rh+i7WnqTpXOufWHeiWwDTWdWqEzFlcAAD4l18QU19g5WBZSd6xboYD7//FmmQYZ+peOcn0WqWei7EgjqUbPg0kZFJcex0uyUEE0tX3fa8GIUyaNUjciS1FvT0AYItRKBjMgbwJ2HDm6ISI62wKsqOy0R0OK76JgRZBIGyf+qrzjbgcw93Wd5WHnzCUBuBJFU2n5hrDw7/uR33b6XRrazObnAydmIEMGFV7u5OoSzU+w== 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=Ugtntkxt/aCn/yf/5yWWciE7OXtW9UJfKij4gb8J/r0=; b=gVwk61Mm/rf77rRr23W8Q40GvH7XaBjh+SrantTLyVRznOL2LbQQ8VSVYzW1g088aPpnW3QjRQvdMXJPrtKjPKczjQjPEqM2iifp8RsUL7hv9iB5BhRsAHaXWw6O1MpJKzbpqJxmHH0O6RQ1hkdopJSnKKRx2/8lk9DtSMrAK/C2TQhM0GAY9DSmUJI80gtpfgJLqzCsbMQCfakBzEoc00FM/9Rw57YqayPvhqicUgEU8+EhJ+ZseO+9Csp4fD1eBUm6FwVCqzNYgdc3oUHcvnqElqtONFXqHsYDrMkn5BW5YaHSwP3tAixuQDdAWrrJUlGXb8iY08dglQQkaWUevQ== 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=Ugtntkxt/aCn/yf/5yWWciE7OXtW9UJfKij4gb8J/r0=; b=GN2PrnIt1CxLL1tXxnfMROoaUDmy8A3zfE/ZBpDfkk8kyucyh/XJPtRwlEkjC0DiFnbFfc/nfzlDUo4p5MHYZHOgBiIr5cywzw2zKe1uLE9r7GIutA8db0/5Xix+RT4lnM/K3e/Byp6AJUaz/zWut91A8B3DptR/ipzKsbbjVC4= 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 DM5PR1201MB0121.namprd12.prod.outlook.com (2603:10b6:4:56::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.23; Thu, 7 Jan 2021 18:50:42 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::d95e:b9d:1d6a:e845%12]) with mapi id 15.20.3721.024; Thu, 7 Jan 2021 18:50:42 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [PATCH v3 10/15] OvmfPkg/MemEncryptSevLib: Coding style fixes in prep for SEC library Date: Thu, 7 Jan 2021 12:48:20 -0600 Message-ID: X-Mailer: git-send-email 2.30.0 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM6PR13CA0047.namprd13.prod.outlook.com (2603:10b6:5:134::24) 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 DM6PR13CA0047.namprd13.prod.outlook.com (2603:10b6:5:134::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.2 via Frontend Transport; Thu, 7 Jan 2021 18:50:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ec7d6c0f-39ae-469e-14a9-08d8b33d2225 X-MS-TrafficTypeDiagnostic: DM5PR1201MB0121: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kleK9agcI9hJpgKt2k/Gru0DS8odO8Xewm1DUBpitk1I+LxD+KEXvMjobk0Iokx7hMbIZHy4Sjxs026MSmwG1veSAo2tHa6c31PgYBBKGp3LQGbCrXb7btziBaUhODlmDIEh9qC346Qh5v1zRoHCwdMIZDA2dC7WhVe3hpu6za2by/VpLPEsuHu8zAXda92/pEWuJO0xTA72PJ5g8bsgELLglA14CTmpnHqEYqmtShK134Aua4SkQfMiUhWMWng41LxAA6TAWwdSq5Sbe3UrpLxXm/XENqM1CyB5xNOuZhu03MneKqFs0PFcfNKOeW2Kv7yaF9bkp+kVLEK+3nnC0lpVuXhDBITVe/3SpYau8xF2rPf9TrbJY5ZsdBpf3yROKlWvPl2bc+FVICIjRSUJ3dX5BknW4eapqky83aW+wiIgPnJK/Yal3dq+cFxOnj+65HK9j+Upf9k6ysnzaYk1wQ== 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)(39860400002)(136003)(366004)(346002)(376002)(396003)(54906003)(36756003)(316002)(52116002)(16526019)(186003)(6666004)(7696005)(4326008)(83380400001)(66556008)(66946007)(6916009)(956004)(2906002)(8936002)(5660300002)(6486002)(66476007)(8676002)(86362001)(478600001)(966005)(2616005)(26005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?fvuH04/zJVycLyFRKIp7DMjdwjj03NzEFT3C5Byd6uHDFhr/0xmJr7qBXSEE?= =?us-ascii?Q?QUavNgLUuIKNugxqMisQJ8vDe5G39pEJ5PG5fB1yF4T2xKl3zJNepY41tHJi?= =?us-ascii?Q?tqTi2E3itKA+Hc43nUt/6hmP6jiVpM3gq1UC4bp7bmSGZe5XQRX4Hgh+khrp?= =?us-ascii?Q?yN/O+j+/oHcS5z5JI/UZ2mvV9l4sOp6DBCGtExg8RLL2gLcNpTitRg5TMa1f?= =?us-ascii?Q?JSFXFrcm7Qv8yeYEn8/bmQ/xjjf0TzQCF7CYTZUjof9rmPCGOjxG+Tp2s6fS?= =?us-ascii?Q?yv19YYjjHiQ6+AopHOU1FdSmE731W6wGig9RH3h8mqozqX30hNGEmd9CPmsn?= =?us-ascii?Q?jXdj4dKmfeEkW2JsHM7D0jwX9e57wXi+D1hOj2G3qeViy/h+3nzfSSUmJd46?= =?us-ascii?Q?s8FyexDHAg3DZZ5HTB3XCZ2HDcSRXHN7z45XzjWcrvCzXq8oPUicvF47bs0l?= =?us-ascii?Q?9FOvfedKEoqf3nynEd7htjg0zqKKKMXLChnyEB2I7FWAk+BFFDS4+PlhkvHr?= =?us-ascii?Q?UJ/TnEYCyMjuCfCw+ojcQCH7Iq7BE5tYxmAcCfpg529UYtiG5g2g+qog+kJz?= =?us-ascii?Q?nRMdDu5fzwJLnxoU5FXjrY5tZE+EBbsNlfYPoXJLfgzTlZuAStLbVjtGFtfU?= =?us-ascii?Q?uLWlGMLcs1lAl1FDcSpGeOoJ6TdtmQkr6YWMdAlQl9v1VYUZqE3s3rbCTWDs?= =?us-ascii?Q?UzDLHYLgyLTKPB+GhMDVn4L4WlfBOYGSvu1nT0yJeZWlbUVLUD1THKx1bySQ?= =?us-ascii?Q?hKwm8f2XDgIsEVsT+bLQLYDqAT45QL9BHD2vDt7znO+vQddId7L0NnstOrxS?= =?us-ascii?Q?pW4g+ifMeEaMcns0ia4cMxkwYQ3q0gu60XqcyVq6DAPMubG3TSoCTN30eEzx?= =?us-ascii?Q?SkuV+S8JfY/CeT8yFvw/KpNC3dxiM9RqSdGf2fqOFH5eFEkzDHbpZZKdohrC?= =?us-ascii?Q?69wzasTybJISoIqCM7DGvKM1r8wCO+oad3WiX7BgNb5JlMWOSA0Gv89qXVx7?= =?us-ascii?Q?voep?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2021 18:50:41.9437 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-Network-Message-Id: ec7d6c0f-39ae-469e-14a9-08d8b33d2225 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6nmqXnTm9vNuelhvxZ0bB2kFuMohUYL7WnA55OkMiSNRa9gu4+34NUm9siTwQm/qu4O8oRpsbVAhe2n46G0/xg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0121 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3108 Creating an SEC version of the library requires renaming an existing file which will result in the existing code failing ECC. Prior to renaming the existing file, fix the coding style to avoid the ECC failure. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Brijesh Singh Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c b/Ovm= fPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c index 6422bc53bd5d..3a5bab657bd7 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c @@ -192,7 +192,8 @@ Split2MPageTo4K ( { PHYSICAL_ADDRESS PhysicalAddress4K; UINTN IndexOfPageTableEntries; - PAGE_TABLE_4K_ENTRY *PageTableEntry, *PageTableEntry1; + PAGE_TABLE_4K_ENTRY *PageTableEntry; + PAGE_TABLE_4K_ENTRY *PageTableEntry1; UINT64 AddressEncMask; =20 PageTableEntry =3D AllocatePageTableMemory(1); @@ -472,7 +473,7 @@ Split1GPageTo2M ( /** Set or Clear the memory encryption bit =20 - @param[in] PagetablePoint Page table entry pointer (PTE). + @param[in, out] PageTablePointer Page table entry pointer (PTE). @param[in] Mode Set or Clear encryption bit =20 **/ @@ -562,7 +563,6 @@ EnableReadOnlyPageWriteProtect ( @retval RETURN_UNSUPPORTED Setting the memory encyrption attrib= ute is not supported **/ - STATIC RETURN_STATUS EFIAPI @@ -635,7 +635,7 @@ SetMemoryEncDec ( =20 Status =3D EFI_SUCCESS; =20 - while (Length) + while (Length !=3D 0) { // // If Cr3BaseAddress is not specified then read the current CR3 @@ -683,7 +683,7 @@ SetMemoryEncDec ( // Valid 1GB page // If we have at least 1GB to go, we can just update this entry // - if (!(PhysicalAddress & (BIT30 - 1)) && Length >=3D BIT30) { + if ((PhysicalAddress & (BIT30 - 1)) =3D=3D 0 && Length >=3D BIT30) { SetOrClearCBit(&PageDirectory1GEntry->Uint64, Mode); DEBUG (( DEBUG_VERBOSE, @@ -744,7 +744,7 @@ SetMemoryEncDec ( // Valid 2MB page // If we have at least 2MB left to go, we can just update this ent= ry // - if (!(PhysicalAddress & (BIT21-1)) && Length >=3D BIT21) { + if ((PhysicalAddress & (BIT21-1)) =3D=3D 0 && Length >=3D BIT21) { SetOrClearCBit (&PageDirectory2MEntry->Uint64, Mode); PhysicalAddress +=3D BIT21; Length -=3D BIT21; --=20 2.30.0