From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.75]) by mx.groups.io with SMTP id smtpd.web11.3204.1588364281324772684 for ; Fri, 01 May 2020 13:18:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=jHjqjTm7; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.94.75, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DOOIE6ZyCPhmU1WKEwp2JR1AWYB8U9LiZhJ+SniLRdDi1ZMCUkK8EONCadJ6pxmtrH890ND0iPu5czUkjqqTEUa+CZPj1i5Olovm8xyZmNWAntJX79jp+VugWE5zpHQ/yCPBFI37ovAVgLbSN1aJgxCkD7Fyy6agc4KC/Art4cBDObH0tI9Kl+TQM8Kt5oaDpEF7L6ii/hhHY0zHybP6lTAMZDKQaYovTO3EMEv2DVIV6/85bOv7875t36ljto/QfzsxEVGi+5nTRN5wvGuuuGYiz436xCx6yEBTkjSo1c3Th2WU2WuBb8fLUu8ISShZ+88ckr6he9Zx4tTQAn5AvA== 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=5uaoB4wGeuBb1pzLFBZ0smQWYTAl2gA/fuYFTpa4nAs=; b=F9ndridZU9T0IA+cz0l6JxdN0oOJf3jUR9NQVT+wiXchZIPWdyP4e/glM+8SThXXy6maBQtlluNxnQ4smelKyt4qkD5lmHV475U5APV9ePp/2jscjV1RE41R+3l8hmr/xTSeJWcmhsiyPluDc2JSbdJSm9jkTHpqT8mIhdjpuL4s4LdTnhvc0LGTxe0NqDhBFdyBja1gyg+BuKl5JUxHsbox2+DZipX1RaMno32TeEhXjIdPdVq42yfi++QPE+nPdZ05KUTwSbq8dUmTl+hOfgs7q06bU74n2dQxYw01x1A6kw5px2V95gRfL6wrhQNOr9hrnGMAogcPsCCp/x5VKQ== 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=5uaoB4wGeuBb1pzLFBZ0smQWYTAl2gA/fuYFTpa4nAs=; b=jHjqjTm7W08Dkzwx2rJA90m/uM6iQDcSmkVwQ7XTYei6J8J+qRHwpM73c6d1IRFHJzvvxZXjE063uzlyrKWxSzBZidPEqKPLmPR7oJ4SYObdpxYV/geM2aNntQqRpEagFsCeM2FsG2Wsp93ka/FEEOePk7fMm+e03hHMpjpy0X8= 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 DM5PR12MB1676.namprd12.prod.outlook.com (2603:10b6:4:8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.27; Fri, 1 May 2020 20:17:59 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1%10]) with mapi id 15.20.2937.028; Fri, 1 May 2020 20:17:59 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Liming Gao , Eric Dong , Ray Ni , Brijesh Singh , Anthony Perard , Benjamin You , Guo Dong , Julien Grall , Maurice Ma , Andrew Fish Subject: [PATCH 4/4] UefiCpuPkg/CpuExceptionHandler: Revert binary patching in standard CpuExceptionHandlerLib Date: Fri, 1 May 2020 15:17:41 -0500 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: SN1PR12CA0068.namprd12.prod.outlook.com (2603:10b6:802:20::39) 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 SN1PR12CA0068.namprd12.prod.outlook.com (2603:10b6:802:20::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19 via Frontend Transport; Fri, 1 May 2020 20:17:58 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 3b688eed-2ce7-428b-0420-08d7ee0cbe4f X-MS-TrafficTypeDiagnostic: DM5PR12MB1676:|DM5PR12MB1676: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:626; X-Forefront-PRVS: 0390DB4BDA X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BnatpaHa7+NOxEtrsVdhaNcZH2aZIYFn/qvKGd17ItMRLlGoxjKxlxbEi5zJZCvCmwL4fPjyyDRVB51l1WbqH1Ee9MlcQz+Z5Uddsondt0Nnbk8JwKCvwD5fmYqCINgW+B9XMmOmm1D34o0RdZc5xTrtBASWGSb7UqBXfrBk4eHj4KMwlxG1zK8cZfxrYwVNrKCYSNhFSB6K8TJ4LnTZE1fA2ecnp4vYXgdMRkdlz2ORcrj+BgZA8+IcCC5ofGhbuqtdn9VZZKTWArWDzwD4XIU1fCrRWyzR9lSzdw0Jmmmy4YrqYouLS3OiZ/8obX6J/IM1RMgUTALoIjWuHMV1vnYvDFPZSKBCAeSjqKqF6nPVMXncYn4fPi/obft7U2LIW7/os/zjbxQwzPQNou1RGuqGOAMx872WyxCnlGo0rwRbsMO5MTXbBRUIccQ/z4vB7hZWKtTON14XnL5ifZRKAGHTADrsWMq+Fy2LvJHGe1lY1M0yrNbfGbpbpVWruhouPxsdt5TqtO8NdVZ7tBeNf1p71NTXQY6+hLXSjr2X4iPgYMyjm5/ZvJHt44/IRzJamIRNwVXIHRnYW95TPa61mw== 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;SFTY:;SFS:(4636009)(376002)(396003)(136003)(346002)(366004)(39860400002)(66946007)(52116002)(26005)(7696005)(8676002)(66556008)(66476007)(16526019)(6666004)(186003)(6486002)(316002)(2906002)(966005)(86362001)(6916009)(8936002)(54906003)(4326008)(7416002)(19627235002)(478600001)(5660300002)(956004)(36756003)(2616005)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: KGtVbYcsWlFjCfLCMEXNWlDeRUHP7zF/QHMBK2DogWIW6/+VnDfv5BCAaM9kpM2cWmqYDANUn3JW0J0h4TzwtXa6Gvlb5bV/y7I9pjfb9Jpj+5lmJDojzSHEXWN/nk0oT9QHYECN/GrhyZ7yFJbJc9/nUEjXgPtMsCo1R5LPMGBe7BWGTtuXeqSNPKPn5yVFQ8XEw309rNGWGArBuXhNSZ5n3KEHX7TdydnFZxwvNJcEih2t9KBZuKaRH7dT3KSV3GRFCl0mAYAIOXFgrIxBoutn/uqHTICv2So0NJmTnnqMgVGVh611gUAhn8PtQjW+Gsb+XnluDDTFK4MkrkQCNBkgWXXJENOZIYbl1ZhaMO0zu9yVHPPKyBxuPSmO99P5i1o1NFm594978L5Bx4EvXunsyDC65gxtC75xmcw1I+Eos/J8Z/J7mQcXsnYNf2AxPjX4iyYh2Oau8cZasZA2Z2VcM6OMxXYIuat2nilpKiRJ217odazEthUen4bc2tPqfJ4rfJieYUQugakbDJmZwLeDtDP6hOD5k0USX97Dlg2lysmNa6B9clBTHr84waMYwcQdIkifuICLfQkqok3zbjNTXouN5Q8JgQMxfPofHkglsYChiG15d195/48lU1rUrw1IOBxj4Dqf+z+vwhwpAIx5E05Wf2bA4B0wdYhFhYGn53jjZ6yf7WgQPOyFmksqHh6u23+3m0PSYDPcwxf59j6ZoK60Wlp0/+hhneade+C+4JBVND7aLbLTuxaI8CU+9XxlOyDsnrYr7koVzQIb8VFaTPHzMN/sikqqHdPveNE= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b688eed-2ce7-428b-0420-08d7ee0cbe4f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2020 20:17:59.8251 (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: sSZTpHX2Tu0JQnLJaBTfXP0k3a6wzf9jxfCHyzusIIcpOTPkwFaRCWgGiecwnPhuO4ktK5V3nH6iOsBKbHYTeQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1676 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2340 Now that an XCODE5 specific CpuExceptionHandlerLib library is in place, revert the changes made to the ExceptionHandlerAsm.nasm in commit 2db0ccc2d7fe ("UefiCpuPkg: Update CpuExceptionHandlerLib pass XCODE5 tool chain") so that binary patching of flash code is not performed. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Liming Gao Signed-off-by: Tom Lendacky --- .../X64/ExceptionHandlerAsm.nasm | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm index 19198f273137..3814f9de3703 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm @@ -34,7 +34,7 @@ AsmIdtVectorBegin: db 0x6a ; push #VectorNum db ($ - AsmIdtVectorBegin) / ((AsmIdtVectorEnd - AsmIdtVectorBegin) / 32) ; VectorNum push rax - mov rax, strict qword 0 ; mov rax, ASM_PFX(CommonInterruptEntry) + mov rax, ASM_PFX(CommonInterruptEntry) jmp rax %endrep AsmIdtVectorEnd: @@ -44,8 +44,7 @@ HookAfterStubHeaderBegin: @VectorNum: db 0 ; 0 will be fixed push rax - mov rax, strict qword 0 ; mov rax, HookAfterStubHeaderEnd -JmpAbsoluteAddress: + mov rax, HookAfterStubHeaderEnd jmp rax HookAfterStubHeaderEnd: mov rax, rsp @@ -257,7 +256,8 @@ HasErrorCode: ; and make sure RSP is 16-byte aligned ; sub rsp, 4 * 8 + 8 - call ASM_PFX(CommonExceptionHandler) + mov rax, ASM_PFX(CommonExceptionHandler) + call rax add rsp, 4 * 8 + 8 cli @@ -365,24 +365,11 @@ DoIret: ; comments here for definition of address map global ASM_PFX(AsmGetTemplateAddressMap) ASM_PFX(AsmGetTemplateAddressMap): - lea rax, [AsmIdtVectorBegin] + mov rax, AsmIdtVectorBegin mov qword [rcx], rax mov qword [rcx + 0x8], (AsmIdtVectorEnd - AsmIdtVectorBegin) / 32 - lea rax, [HookAfterStubHeaderBegin] + mov rax, HookAfterStubHeaderBegin mov qword [rcx + 0x10], rax - -; Fix up CommonInterruptEntry address - lea rax, [ASM_PFX(CommonInterruptEntry)] - lea rcx, [AsmIdtVectorBegin] -%rep 32 - mov qword [rcx + (JmpAbsoluteAddress - 8 - HookAfterStubHeaderBegin)], rax - add rcx, (AsmIdtVectorEnd - AsmIdtVectorBegin) / 32 -%endrep -; Fix up HookAfterStubHeaderEnd - lea rax, [HookAfterStubHeaderEnd] - lea rcx, [JmpAbsoluteAddress] - mov qword [rcx - 8], rax - ret ;------------------------------------------------------------------------------------- -- 2.17.1