From nobody Sun May 5 18:53:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1513927426710199.65480376812786; Thu, 21 Dec 2017 23:23:46 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id EEB4E222CB319; Thu, 21 Dec 2017 23:18:55 -0800 (PST) Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id EE8FA222CB312 for ; Thu, 21 Dec 2017 23:18:52 -0800 (PST) Received: by mail-wr0-x243.google.com with SMTP id y21so27131172wrc.1 for ; Thu, 21 Dec 2017 23:23:42 -0800 (PST) Received: from localhost.localdomain ([2a02:908:5a9:8400:5ec8:3210:9b68:c91c]) by smtp.gmail.com with ESMTPSA id m68sm16070965wmi.28.2017.12.21.23.23.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Dec 2017 23:23:39 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::243; helo=mail-wr0-x243.google.com; envelope-from=sigmaepsilon92@gmail.com; receiver=edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=e4itJFkUKDO7/N/qBU9qW2h3GYAS0682pi/QJN0kaJY=; b=lCbdipkd2RJnt1CEUTVdRVo2ePIroSjNBzWW0QqwYnP6IXSGsFBw26WCYAMrsv2kEL I+dbWwGWRCmA4XpyiKu1jkKHj/TethmTxa5gmD+AcqWVD7tbpO1If/fAbRXuvr6ykkuP 5FtsXP8lLK1lU/bnu1tcSF25a5Qg/ABXxl52RS90PdevpbseC2vL5rSr/RTrCzjjJMRN +wlyFmjT9RMjq5+wD+7z3/DvunQ3AhWpriQr8F3p4wbA3bwfZdPlk/IN6hKSlfK8+CU3 I0dlcXGSfcQRDTi8FHHQoG5kkJQ48ELVn6R8WWpSHzeN6oDelwP1Ul6ELb5ON/ejdxdx auFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=e4itJFkUKDO7/N/qBU9qW2h3GYAS0682pi/QJN0kaJY=; b=gzl+7tTG1nLSMo5tO2xigQlTD2EwHNq305v1jwMSs8LSrYUuTvh+nCco5eHPScejsH lq8ve9MNOU6TZ4XM281tHaKnp/IqShCJKmHVnILJ2wXv/JUTAGQxE9o+PpQUr23cxumC SLynB/Zz1xbUHCGfTD0vHnsSGVPYSuq58OKRKVY77yuxReYHqwdJ7kfAYFWfXrBwPQ/H vldSVqnKIn1ZaEWD2y1doo0CYeV6L6y1D/WtxiZfcKqMX5Gqb04U672duxfLwPVg5Hi7 4IsZ7HdxKWhQ5W83WyssoegDmc99M9qON/HToyzBELBmEhcp1QR8G6kUYUyv7F6RyV6J DVKQ== X-Gm-Message-State: AKGB3mIb33kuhQZdzA1+49ls5cLubVkMKMi3qfhcEi52ngVcMOsTmGxz I7HVH5V1tbyTwP1ZBaz8s3+kGIQT X-Google-Smtp-Source: ACJfBoshpA3qLOrOvWY9Cbc50FLngT1Eu5ZpFz1mUfwDQkfFLf6NF40criSzaFCp0hjeV1jZXhFRMA== X-Received: by 10.223.178.163 with SMTP id g32mr13668803wrd.129.1513927421018; Thu, 21 Dec 2017 23:23:41 -0800 (PST) From: M1cha To: edk2-devel@lists.01.org Date: Fri, 22 Dec 2017 08:23:34 +0100 Message-Id: <20171222072336.23504-2-sigmaepsilon92@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171222072336.23504-1-sigmaepsilon92@gmail.com> References: <20171222072336.23504-1-sigmaepsilon92@gmail.com> Subject: [edk2] [PATCH 1/3] MdePkg: add RETURNS_TWICE attribute X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Liming Gao , Ard Biesheuvel MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael Zimmermann --- MdePkg/Include/Base.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h index 22ab5d3715fb..c863de407418 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h @@ -218,6 +218,16 @@ VERIFY_SIZE_OF (__VERIFY_UINT32_ENUM_SIZE, 4); #endif #endif =20 +#ifndef RETURNS_TWICE + #if defined (__GNUC__) || defined (__clang__) + #define RETURNS_TWICE __attribute__((returns_twice)) + #elif defined(_MSC_EXTENSIONS) && !defined(MDE_CPU_EBC) + #define RETURNS_TWICE + #else + #define RETURNS_TWICE + #endif +#endif + // // For symbol name in assembly code, an extra "_" is sometimes necessary // --=20 2.15.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun May 5 18:53:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1513927428625873.2661404194068; Thu, 21 Dec 2017 23:23:48 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 4EC72222CB31C; Thu, 21 Dec 2017 23:18:56 -0800 (PST) Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E8DC5222CB30D for ; Thu, 21 Dec 2017 23:18:53 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id l19so14750210wrc.2 for ; Thu, 21 Dec 2017 23:23:43 -0800 (PST) Received: from localhost.localdomain ([2a02:908:5a9:8400:5ec8:3210:9b68:c91c]) by smtp.gmail.com with ESMTPSA id m68sm16070965wmi.28.2017.12.21.23.23.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Dec 2017 23:23:41 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=sigmaepsilon92@gmail.com; receiver=edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o8zmwRxmYxX2wPq6wz4QvVcma8nuExuhc9+Am0QhdTE=; b=qm/0gGbNredN0xy7E4Q3jAPq6eB23CaLCNOEW49J25aADgI+VSufn+w2XrvSn6ZkE7 Gxlh7R5v+jEhnK9YyI/i+tskHjJXm4aVwyx6knnH170Ds0zeHCB6CKMLhKDqRcMmTxbN wermOpnwM1E/HAHSY4HoLjkUsXOEekmqCf5zQnHBgzbJI8biY/sQWLwyLd1e+1Qt7h9K W270FvIaqVGHhT9z5SCFxQP5LGtN9YJcgh/WRQP8u4JxBC65EX4bk3Ai6YaUFSVy3c++ 6V+mctUC3XC9BtToKiXm9MReSqdW2Z++LIzz6cN9I2lDkWRyZTuTGi33TcdrQuFVk8+j Y5nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o8zmwRxmYxX2wPq6wz4QvVcma8nuExuhc9+Am0QhdTE=; b=sax5HkzxM+3yFAgC7ZEtYv9pnfPk8pPkEjgpcnI01SQY7GEMJtW7NZS3aqpKl8DZMg jw/dThaSlGsz/nvpkFhRRUFiohqmGOdyBbcSMrCHQtmvy65lgHWwjqGmr+Bth4mZxOhn 3LreXC0d6lDLjnoIrmMpKsZsVvmbKSSiTGmncb1NX1bQxlhxUUkbR5dOzLE2hgwKzsn8 TUfTB1i69SnbbzmY0ZJGzni04dILhYMQRO65Dhv4eaE+dLgiDQv5W+m+RwNtJMbqV2g2 D2GyjR+wdlz7yeCOVkExvybc7Z+7Ml5RMxc4plZyWc/6Bj1n5o8fMK00+mSjT3/7L0jP mjYQ== X-Gm-Message-State: AKGB3mKhftptBxpsTbjgXV9MAwwhlCI21cMH2GB9e5okJVaWL5mFzDuH lKv8aqxuXcqNmC6ssk+NLqlNPmC1 X-Google-Smtp-Source: ACJfBotmzb4JxhnfuR+00MPZZCoDdyQ+AFmdZnqRZbW9D32I6/G1LtfA0KM1Wk5NsilucUlAe3o5VA== X-Received: by 10.223.136.243 with SMTP id g48mr5980366wrg.247.1513927422065; Thu, 21 Dec 2017 23:23:42 -0800 (PST) From: M1cha To: edk2-devel@lists.01.org Date: Fri, 22 Dec 2017 08:23:35 +0100 Message-Id: <20171222072336.23504-3-sigmaepsilon92@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171222072336.23504-1-sigmaepsilon92@gmail.com> References: <20171222072336.23504-1-sigmaepsilon92@gmail.com> Subject: [edk2] [PATCH 2/3] MdePkg/BaseLib: add attribute 'RETURNS_TWICE' to SetJump X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Liming Gao , Ard Biesheuvel MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When compiling with any ARM toolchain and Os, registers can get trashed when returning for the second time from SetJump because GCC only handles this correctly when using standard names like 'setjmp' or 'getcontext'. When different names are used you have to use the attribute 'returns_twice' to tell gcc to be extra careful. example: extern int FN_NAME(void*); void jmp_buf_set(void *jmpb, void (*f)(void)) { if (!FN_NAME(jmpb)) f(); } this code produces this wrong code with Os: 00000000 : 0: e92d4010 push {r4, lr} 4: e1a04001 mov r4, r1 8: ebfffffe bl 0 c: e3500000 cmp r0, #0 10: 01a03004 moveq r3, r4 14: 08bd4010 popeq {r4, lr} 18: 012fff13 bxeq r3 1c: e8bd4010 pop {r4, lr} 20: e12fff1e bx lr The generated code pushes backups of r4 and lr to the stack and then saves all registers using nonstandard_setjmp. Then it pops the stack and jumps to the function in r3 which is the main problem because now the function can overwrite our register backups on the stack. When we return a second time from the call to nonstandard_setjmp, the stack pointer has it's original(pushed) position and when the code pops r4 and lr from the stack the values are not guaranteed to be the same. When using a standard name like setjmp or getcontext or adding '__attribute__((returns_twice))' to nonstandard_setjmp's declaration the code looks different: 00000000 : 0: e92d4007 push {r0, r1, r2, lr} 4: e58d1004 str r1, [sp, #4] 8: ebfffffe bl 0 c: e3500000 cmp r0, #0 10: 059d3004 ldreq r3, [sp, #4] 14: 01a0e00f moveq lr, pc 18: 012fff13 bxeq r3 1c: e28dd00c add sp, sp, #12 20: e49de004 pop {lr} ; (ldr lr, [sp], #4) 24: e12fff1e bx lr Here the problem is being solved by restoring r3 from the stack without popping it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael Zimmermann Reviewed-by: Ard Biesheuvel --- MdePkg/Include/Library/BaseLib.h | 1 + 1 file changed, 1 insertion(+) diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/Base= Lib.h index 2b98af4cd17e..10976032adaa 100644 --- a/MdePkg/Include/Library/BaseLib.h +++ b/MdePkg/Include/Library/BaseLib.h @@ -4905,6 +4905,7 @@ MemoryFence ( **/ UINTN EFIAPI +RETURNS_TWICE SetJump ( OUT BASE_LIBRARY_JUMP_BUFFER *JumpBuffer ); --=20 2.15.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun May 5 18:53:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1513927430991592.504988100849; Thu, 21 Dec 2017 23:23:50 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A923A222CB31E; Thu, 21 Dec 2017 23:18:56 -0800 (PST) Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C9FCF222CB30D for ; Thu, 21 Dec 2017 23:18:54 -0800 (PST) Received: by mail-wr0-x244.google.com with SMTP id p69so18274818wrb.8 for ; Thu, 21 Dec 2017 23:23:44 -0800 (PST) Received: from localhost.localdomain ([2a02:908:5a9:8400:5ec8:3210:9b68:c91c]) by smtp.gmail.com with ESMTPSA id m68sm16070965wmi.28.2017.12.21.23.23.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Dec 2017 23:23:42 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::244; helo=mail-wr0-x244.google.com; envelope-from=sigmaepsilon92@gmail.com; receiver=edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ptBnk9w1u2iyMCYPJEIXRfBiX+iGzpS8lNBneXOAIoc=; b=jvY5bK72phu9B4Dog/rCHvgdk62gUYuA4B1IvqP1rFVI+Ixs5tZsOcDC9zdrWklPX9 M/JE0Uo2ZURPfJJtOOMuJff8jFAAuQZbkGm/zCBqUrAB/MJT/zLinS2uw47muXR53d9n J6xT+OJCkxsfYnS1U6KqZFdKRy/lGokxa5NJkJ7j7nmxnyiUURvXqJz1v9E/Y/AqfnCf m+9iQcU8FEVTqnpRg0yNClW+sxU/1YOPJiX3cp3tAkrWkl0jPi32KT1EWu6XTewvhnbX 3K3Kr+0PKHh4cJ2CODZqriDXBTFsKBYNFb05MehMdNG60RF2IR+y2Y7jLLT197jj/LdV ClHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ptBnk9w1u2iyMCYPJEIXRfBiX+iGzpS8lNBneXOAIoc=; b=nv6wZa4h0185cOSjYVq6qfa9Sq/C2ijrph7pAnYs105+29hhuPNh5xoFZtjaIwhhNY WJ9hl0q2bmkrA0ce37nA1mtLiXHcHsq61aa6SEvsOsiWsbv/6lJR5E/GwnWq1P71VcMD gEYBaFfofrbn36VTG3BRoxI5P2K70QQLIshaB76FHy0LhwvMhkxJ4B83lbQ+X92pQ+Jd 2hXVg0OFWflx8a/Sqi/AtlQGARl5PplJG1aNM840I25JmPsslFziIXWngVHGJRGPoWLc 88SJB39YvsDVyazskW9JrhaKL9F7MRoviuyEn1ZlYJtNXxoTLYqcBVq55wvZoyWH+1TS 6D4Q== X-Gm-Message-State: AKGB3mIY/nr5+Z0UWxaOYxIWJ8kmLrwhnocs9lLRWmU/3i282JUGcdiR z4Sp8gwzuyirXNeGuWDTDD1Fc3b5 X-Google-Smtp-Source: ACJfBosJ26XwB1U8Gh7ddb0+IO5J1RD8Ivq9tBEcfuJ9PqSZNKsZOjiNhqh7/frvg0Cpwf85JX2LCQ== X-Received: by 10.223.172.114 with SMTP id v105mr14012195wrc.229.1513927423005; Thu, 21 Dec 2017 23:23:43 -0800 (PST) From: M1cha To: edk2-devel@lists.01.org Date: Fri, 22 Dec 2017 08:23:36 +0100 Message-Id: <20171222072336.23504-4-sigmaepsilon92@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171222072336.23504-1-sigmaepsilon92@gmail.com> References: <20171222072336.23504-1-sigmaepsilon92@gmail.com> Subject: [edk2] [PATCH 3/3] MdePkg: add NORETURN attribute to LongJump and InternalLongJump X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Liming Gao , Ard Biesheuvel MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This fixes compiler warnings when using them in functions which should return a value but rely on LongJump to never return instead. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael Zimmermann Reviewed-by: Ard Biesheuvel --- MdePkg/Include/Library/BaseLib.h | 1 + MdePkg/Library/BaseLib/BaseLibInternals.h | 1 + 2 files changed, 2 insertions(+) diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/Base= Lib.h index 10976032adaa..e2eb46da4584 100644 --- a/MdePkg/Include/Library/BaseLib.h +++ b/MdePkg/Include/Library/BaseLib.h @@ -4929,6 +4929,7 @@ SetJump ( **/ VOID EFIAPI +NORETURN LongJump ( IN BASE_LIBRARY_JUMP_BUFFER *JumpBuffer, IN UINTN Value diff --git a/MdePkg/Library/BaseLib/BaseLibInternals.h b/MdePkg/Library/Bas= eLib/BaseLibInternals.h index 9dca97a0dcc9..3cd5fe34fc1b 100644 --- a/MdePkg/Library/BaseLib/BaseLibInternals.h +++ b/MdePkg/Library/BaseLib/BaseLibInternals.h @@ -442,6 +442,7 @@ InternalAssertJumpBuffer ( =20 **/ VOID +NORETURN EFIAPI InternalLongJump ( IN BASE_LIBRARY_JUMP_BUFFER *JumpBuffer, --=20 2.15.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel