Date
1 - 14 of 14
[RFT PATCH v2 1/6] BaseTools/tools_def XCODE: Link X64 with -read_only_relocs suppress
Ard Biesheuvel
Earlier XCODE versions did not support the -read_only_relocs suppress
linker option, which suppresses errors resulting from absolute relocations emitted into read-only sections when building PIE executables. This requires a rather messy workaround in the CPU exception handler libraries, to permit absolute relocations in code that may get copied from a template in some cases. Fortunately, this seems to be permitted now, so add the option for X64 as well (it was already present for IA32). This will allows us to simplify the CPU exception handler libraries in subsequent patches. Signed-off-by: Ard Biesheuvel <ardb@...> --- BaseTools/Conf/tools_def.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index ae43101853870c6d..1855f1038b1571e4 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -3010,9 +3010,9 @@ RELEASE_XCODE5_IA32_CC_FLAGS =3D -arch i386 -c -= Os -Wall -Werror -inclu ##################=0D # X64 definitions=0D ##################=0D - DEBUG_XCODE5_X64_DLINK_FLAGS =3D -arch x86_64 -u _$(IMAGE_ENTRY_POI= NT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20 -pie -all_load -dead_= strip -seg1addr 0x240 -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map=0D - NOOPT_XCODE5_X64_DLINK_FLAGS =3D -arch x86_64 -u _$(IMAGE_ENTRY_POI= NT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20 -pie -all_load -dead_= strip -seg1addr 0x240 -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map=0D -RELEASE_XCODE5_X64_DLINK_FLAGS =3D -arch x86_64 -u _$(IMAGE_ENTRY_POI= NT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20 -pie -all_load -dead_= strip -seg1addr 0x240 -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map=0D + DEBUG_XCODE5_X64_DLINK_FLAGS =3D -arch x86_64 -u _$(IMAGE_ENTRY_POI= NT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20 -pie -all_load -dead_= strip -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(B= ASE_NAME).map=0D + NOOPT_XCODE5_X64_DLINK_FLAGS =3D -arch x86_64 -u _$(IMAGE_ENTRY_POI= NT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20 -pie -all_load -dead_= strip -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(B= ASE_NAME).map=0D +RELEASE_XCODE5_X64_DLINK_FLAGS =3D -arch x86_64 -u _$(IMAGE_ENTRY_POI= NT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20 -pie -all_load -dead_= strip -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(B= ASE_NAME).map=0D =0D *_XCODE5_X64_SLINK_FLAGS =3D -static -o=0D DEBUG_XCODE5_X64_ASM_FLAGS =3D -arch x86_64 -g=0D --=20 2.39.2 |
|
Marvin Häuser
Hi Ard,
Sorry, I cannot preserve the CC list as the groups.io interface doesn't seem to allow it. Can you please CC me on future revisions? This patch will badly corrupt binaries. I cannot cite a source right now (if you want me to, please remind me in your response, so I can look it up tomorrow), but for X64 (but not IA32, which is why this is enabled there), relocs are relative to the first *writable* segment. In other words, any relocation to __TEXT will badly corrupt binaries this way. In AUDK, we support this with two essential changes. The first is that we always generate a writable dummy segment at the beginning of the address space [1], making the relocs relative to the image base. The second is that in ocmtoc, our fork of the abandoned (and pretty badly-bugged) Apple mtoc, we explicitly require this segment to be present and verify its virtual address is the minimum virtual address [2]. It is then omitted from the conversion process [3]. I suggest you replicate these changes and fully switch to ocmtoc for XCODE5 builds. Best regards, Marvin [1] https://github.com/acidanthera/audk/blob/c382e9c571c7d5f39ba53b46a0c723c7943f33c5/BaseTools/Conf/tools_def.template#L2976-L2988 [2] https://github.com/acidanthera/ocmtoc/blob/b0152c51beae264770c3faf0d213f9594ee043be/efitools/mtoc.c#L1097-L1123 https://github.com/acidanthera/ocmtoc/blob/b0152c51beae264770c3faf0d213f9594ee043be/efitools/mtoc.c#L1204-L1214 [3] https://github.com/acidanthera/ocmtoc/blob/b0152c51beae264770c3faf0d213f9594ee043be/efitools/mtoc.c#L1307-L1311 |
|
Ard Biesheuvel
Hi Marvin,
Thanks for the context. On Thu, 30 Mar 2023 at 23:54, Marvin Häuser <mhaeuser@...> wrote: OMG. I can't believe how buggy all this stuff is. But I can confirm that the resulting binaries don't look right, even though they appear to boot fine. In particular, when I dump the PE relocations using llvm-readobj --coff-basereloc, I don't see any relocations referring to the .text section. In AUDK, we support this with two essential changes. The first is that we always generate a writable dummy segment at the beginning of the address space [1], making the relocs relative to the image base. The second is that in ocmtoc, our fork of the abandoned (and pretty badly-bugged) Apple mtoc, we explicitly require this segment to be present and verify its virtual address is the minimum virtual address [2]. It is then omitted from the conversion process [3]. I suggest you replicate these changes and fully switch to ocmtoc for XCODE5 builds.I'm not going to do any of that. Instead, I am going to drop this change, and do the following: - modify the SecPei version of CpuExceptionHandlerLib to put the vector templates in .data, as I proposed before. This works around the issue, and given that SEC/PEI is assumed to be read-only anyway (as it may execute in place from flash) and does not use page alignment for the sections due to size constraints, it is reasonable to assume that .text and .data will be mapped executable anyway. - update the version that performs the runtime fixups to only do so when using the XCODE toolchain - we can phase that out once we drop XCODE support. |
|
Marvin Häuser
On 31. Mar 2023, at 09:39, Ard Biesheuvel <ardb@...> wrote:Codegen does not change from the suppress flag, so there will be no additional text relocs beyond those you introduced. As they target the exception handler, I guess you’d need to actively provoke the broken code paths (and may end up with a nice recursion :) ). In particular, when I dump the PE relocations usingWell, that assumption is more than fair to make for the status quo platforms, but this is just another rock in the way of doing things the right way (even if it’s just VMs). Cc Gerd for an OVMF security perspective. Is PEI-time memory protection something you’d be interested in in the future? I agree if there’s an actual plan on doing that. We depend on XCODE5 downstream, but I think it would literally be easier for us if the upstream version was dropped than rebasing against hacks that our slightly modded variant does not require. Cc Andrew and Rebecca. I don’t know anyone else who might still be using XCODE5. Any objections to dropping it? If so, any plans to pick up my proposed changes instead? Best regards, Marvin |
|
Ard Biesheuvel
On Fri, 31 Mar 2023 at 10:29, Marvin Häuser <mhaeuser@...> wrote:
I understand that the codegen is the same. I was specifically talkingOn 31. Mar 2023, at 09:39, Ard Biesheuvel <ardb@...> wrote:Codegen does not change from the suppress flag, so there will be no additional text relocs beyond those you introduced. As they target the exception handler, I guess you’d need to actively provoke the broken code paths (and may end up with a nice recursion :) ). about the PE relocations, which seem to be lacking entirely. How so? SEC and PEI could be mapped read-only today, it's just that weIn particular, when I dump the PE relocations usingWell, that assumption is more than fair to make for the status quo platforms, but this is just another rock in the way of doing things the right way (even if it’s just VMs). never bother. Cc Gerd for an OVMF security perspective. Is PEI-time memory protection something you’d be interested in in the future?My WXN series for ARM maps all PEIMs read-only, and turns off shadowing entirely (which makes no sense for VMs). So we have most of what we need to do that, and this change has no bearing on that. I wouldn't mind dropping it. In fact, I'm wondering - given that youI agree if there’s an actual plan on doing that. We depend on XCODE5 downstream, but I think it would literally be easier for us if the upstream version was dropped than rebasing against hacks that our slightly modded variant does not require. need to install nasm and iasl anyway - if it wouldn't make more sense to use the CLANGPDB toolchain on macOS, and avoid the mtoc mess entirely? |
|
Gerd Hoffmann
Hi,
Given that PEI is expected to be able to run from read-only storage- modify the SecPei version of CpuExceptionHandlerLib to put theWell, that assumption is more than fair to make for the status quo the easiest way to apply X^W rules would be to just map the whole PEI firmware volume as R-X when executing from RAM (which is the case for OVMF). I've fixed OVMF PEI modules last year to *not* use global variables, so OVMF is not a special case any more and mapping OVMF PEI readonly should work just fine. So Ard's approach looks sane to me. take care, Gerd |
|
Marvin Häuser
On 31. Mar 2023, at 10:59, Ard Biesheuvel <ardb@...> wrote:Sure, I was just elaborating on the “appear to boot fine” part, which does make sense. When I last tried, the relocs were not absent but underflown. Might be mtoc drops them somehow, I think I inspected the Mach-O directly. Whatever, you reproduce the issue. :) I’m not concerned about read-only but NX.How so? SEC and PEI could be mapped read-only today, it's just that weIn particular, when I dump the PE relocations usingWell, that assumption is more than fair to make for the status quo platforms, but this is just another rock in the way of doing things the right way (even if it’s just VMs). Well yes, if everything is read-only, you guarantee W^X implicitly, but downstream we have plans for the full deal including NX data. It’s however shelved for the distant future, so as long as this is changed with the intention of reverting it once XCODE5 is fixed or dropped, that sounds fine to me. I just don’t like the notion of intentionally breaking the memory permission model as a hack. I rather hope we’ll make some swift progress on removing XCODE5 as a source of frustration. :)Cc Gerd for an OVMF security perspective. Is PEI-time memory protection something you’d be interested in in the future?My WXN series for ARM maps all PEIMs read-only, and turns off I’d say using XCODE5 is a historical thing for us. Years ago, Vitaly evaluated both CLANG38 and CLANGPDB and found various things including debugging to be badly broken. In fact, CLANG38 turned out to have issues like misaligning UINT64s *for years*. However, those issues might have been fixed and it’s not impossible Vitaly will give it another try eventually. In any case, I think our downstream variant of XCODE5 doesn’t require any level of special care, so it doesn’t really matter to us.I wouldn't mind dropping it. In fact, I'm wondering - given that youI agree if there’s an actual plan on doing that. We depend on XCODE5 downstream, but I think it would literally be easier for us if the upstream version was dropped than rebasing against hacks that our slightly modded variant does not require. (Another thing to consider is despite the bugs are fixed, mtoc has a much higher overall code quality and more safety checks than GenFw, which is used for CLANGDWARF.) The upstream toolchain has no future in my opinion, as mtoc has been deprecated and already failed to compile certain things (like it lacked Standalone MM types). The reason it still “worked” was because homebrew silently shipped a variant with a subset of our ocmtoc patches. So as I see it, taking our changes or dropping it entirely are the only sane options, even regardless of this particular issue you’re trying to fix. Personally, I have no preference. Best regards, Marvin |
|
Ard Biesheuvel
On Fri, 31 Mar 2023 at 11:27, Marvin Häuser <mhaeuser@...> wrote:
Fair enough.On 31. Mar 2023, at 10:59, Ard Biesheuvel <ardb@...> wrote:Sure, I was just elaborating on the “appear to boot fine” part, which does make sense. When I last tried, the relocs were not absent but underflown. Might be mtoc drops them somehow, I think I inspected the Mach-O directly. Whatever, you reproduce the issue. :) We don't have writable data in SEC or PEI, so this would require SEC,I’m not concerned about read-only but NX.How so? SEC and PEI could be mapped read-only today, it's just that weIn particular, when I dump the PE relocations usingWell, that assumption is more than fair to make for the status quo platforms, but this is just another rock in the way of doing things the right way (even if it’s just VMs). PEI_CORE and every PEIM to have split .text and .rodata, and round them up to page size. Not sure this is worth it, especially given the fact that CoCo targets seems to be skipping the PEI phase entirely. Pardon my bluntness, but why should I care about the shelved futureWell yes, if everything is read-only, you guarantee W^X implicitly, but downstream we have plans for the full deal including NX data. It’s however shelved for the distant future, so as long as this is changed with the intention of reverting it once XCODE5 is fixed or dropped, that sounds fine to me. I just don’t like the notion of intentionally breaking the memory permission model as a hack. I rather hope we’ll make some swift progress on removing XCODE5 as a source of frustration. :)Cc Gerd for an OVMF security perspective. Is PEI-time memory protection something you’d be interested in in the future?My WXN series for ARM maps all PEIMs read-only, and turns off plans of some downstream project? Wow, that is very bad. Was that reported to the mailing list?I’d say using XCODE5 is a historical thing for us. Years ago, Vitaly evaluated both CLANG38 and CLANGPDB and found various things including debugging to be badly broken. In fact, CLANG38 turned out to have issues like misaligning UINT64s *for years*.I wouldn't mind dropping it. In fact, I'm wondering - given that youI agree if there’s an actual plan on doing that. We depend on XCODE5 downstream, but I think it would literally be easier for us if the upstream version was dropped than rebasing against hacks that our slightly modded variant does not require. However, those issues might have been fixed and it’s not impossible Vitaly will give it another try eventually. In any case, I think our downstream variant of XCODE5 doesn’t require any level of special care, so it doesn’t really matter to us.I think both GenFw and mtoc are horrible hacks that should be phased out once we can - with good cross-architecture Clang support for native PE binaries, I'd hope macOS could move to CLANGPDB for all targets. |
|
Marvin Häuser
On 31. Mar 2023, at 11:36, Ard Biesheuvel <ardb@...> wrote:
CoCo = Confidential Computing? Right, I actually hope that’s true. :) But there are also some plans for real hardware here.
No worries. The part you should care about is that this violates a well-established, well-reasoned, and important convention. This generates objectively broken binaries that only happen to work due to current implementation details. The “future plans” part was an explanation of why I’m persistent about it, stating that some folks want to depend on said convention. As your change affects XCODE5 only (and thus there will be no future changes that rely on this hack), I’m fine to drop this. Basically I was scared this will become part of the design and folks will magically start depending on this hack. :)
Yes, with my 2021’s patch ignored, of course. Pedro’s respin was merged though: https://github.com/tianocore/edk2/commit/c5d68ef6e7553ab2894f541eba4e982428ecbd53
That’s a bit too utopian (or actually, dystopian). First, to my understanding, this will also break GCC, no? Maybe there’s good support for generating PEs now, who knows. As far as I’m aware, pairing PE with DWARF isn’t really a well-supported thing either. But again, old experiences, may be better now. Yet, even if all of this works fine now, this is still a PE lock-in. For cross-platform and cross-format support, something like GenFw and mtoc is unavoidable. In fact, my current thesis topic is designing a replacement for the TE format and a tool to generate it from PEs and ELFs. In contrast to GenFw and mtoc, the design is not to attempt to translate the details of one format into another, but to define an abstract model of an UEFI image file and use this both on the consumer side (a generic loader library) and the producer side (the generation tool uses an intermediate representation for conversion rather than doing format-to-format). This actually works very well. :) Best regards, Marvin |
|
Gerd Hoffmann
Hi,
What is the difference between CLANGPDB and CLANGDWARF? Just the debugHowever, those issues might have been fixed and it’s not impossibleI think both GenFw and mtoc are horrible hacks that should be phased info format? What is the support status? Is CLANGDWARF expected to build edk2 on all platforms? Including cross-builds? Or will that work only after Rebecca's toolchain fix/cleanup series being merged? Should we eventually switch from gcc to clang on linux too? take care, Gerd |
|
Ard Biesheuvel
On Fri, 31 Mar 2023 at 12:53, Gerd Hoffmann <kraxel@...> wrote:
No, it uses the LLVM tools to generate PE binaries directly. What is the support status? Is CLANGDWARF expected to build edk2 on allYes, that what I was hoping for - LLD supports all architectures, which is why I insisted that CLANGDWARF should use LLD on ARM/AARCH64 as well. That way, anyone can build all targets on any host. Should we eventually switch from gcc to clang on linux too?When using ELF to PE/COFF conversion, it doesn't make that much of a difference. |
|
Marvin Häuser
Hi Gerd,
On 31. Mar 2023, at 12:53, Gerd Hoffmann <kraxel@...> wrote:DWARF generates an ELF (which is utilized by UefiPayloadPkg) and PDB generates a PE directly. Best regards, Marvin
|
|
Rebecca Cran
On 3/31/23 2:29 AM, Marvin Häuser wrote:
I agree if there’s an actual plan on doing that. We depend on XCODE5 downstream, but I think it would literally be easier for us if the upstream version was dropped than rebasing against hacks that our slightly modded variant does not require.I've only been using XCODE5 to test if it still works. I do all of my development work on Linux or FreeBSD. -- Rebecca Cran |
|
Marvin Häuser
On 31. Mar 2023, at 16:58, Rebecca Cran <rebecca@...> wrote:I checked the list and most of the traffic regarding XCODE5 is basically Andrew and you. So if you don't need this toolchain... @Andrew Would you agree it's fair for Apple to maintain XCODE5 and its oddities downstream? I know someone mentioned the ARM transition, but I think you still support UEFI for HV things, don't you? The alternative would be we revamp the upstream XCODE5 toolchain and mtoc with our changes from AUDK and ocmtoc, but this isn't feasible without strong support from Apple (our previous patches to mtoc were ignored). I don't think the burden easily fixable XCODE5 oddities put on the general codebase are acceptable going forward. Thanks! Best regards, Marvin
|
|