Message ID | 20201023200645.1055-1-dbuono@linux.vnet.ibm.com |
---|---|
Headers | show |
Series | Add support for Control-Flow Integrity | expand |
On 10/23/20 3:06 PM, Daniele Buono wrote: > v2: Several months (and structural changes in QEMU) have passed since v1. > While the spirit of the patch is similar, the implementation is changed > in multiple points, and should address most if not all the comments > received in v1. > 5) Most of the logic to enable CFI goes in the configure, since it's > just a matter of checking for dependencies and incompatible options. > However, I had to disable CFI checks for a few TCG functions. > This can only be done through a blacklist file. I added a file in the > root of QEMU, called cfi-blacklist.txt for such purpose. I am open to > suggestions on where the file should go, and I am willing to become the > maintainer of it, if deemed necessary. In the meantime, we have commits like: commit b199c682f1f0aaee22b2170a5fb885250057eec2 Author: Philippe Mathieu-Daudé <philmd@redhat.com> Date: Thu Sep 10 09:01:31 2020 +0200 target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken() In order to use inclusive terminology, rename host_tsx_blacklisted() as host_tsx_broken(). which may help you in coming up with a more appropriate name for the new file. > > MAINTAINERS | 5 + > accel/tcg/cpu-exec.c | 9 ++ > configure | 214 ++++++++++++++++++++++++++++++++++ > include/qemu/sanitizers.h | 22 ++++ > meson.build | 3 + > plugins/core.c | 25 ++++ > plugins/loader.c | 5 + > tcg/tci.c | 5 + > tests/check-block.sh | 18 +-- > tests/qtest/fuzz/fork_fuzz.ld | 12 +- > util/main-loop.c | 9 ++ > util/oslib-posix.c | 9 ++ > 12 files changed, 328 insertions(+), 8 deletions(-) > create mode 100644 include/qemu/sanitizers.h although I don't see a new file by that name here, so perhaps the v1 overview is now stale?
On 10/23/2020 4:33 PM, Eric Blake wrote: > On 10/23/20 3:06 PM, Daniele Buono wrote: >> v2: Several months (and structural changes in QEMU) have passed since v1. >> While the spirit of the patch is similar, the implementation is changed >> in multiple points, and should address most if not all the comments >> received in v1. > >> 5) Most of the logic to enable CFI goes in the configure, since it's >> just a matter of checking for dependencies and incompatible options. >> However, I had to disable CFI checks for a few TCG functions. >> This can only be done through a blacklist file. I added a file in the >> root of QEMU, called cfi-blacklist.txt for such purpose. I am open to >> suggestions on where the file should go, and I am willing to become the >> maintainer of it, if deemed necessary. > > In the meantime, we have commits like: > > commit b199c682f1f0aaee22b2170a5fb885250057eec2 > Author: Philippe Mathieu-Daudé <philmd@redhat.com> > Date: Thu Sep 10 09:01:31 2020 +0200 > > target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken() > > In order to use inclusive terminology, rename host_tsx_blacklisted() > as host_tsx_broken(). > > which may help you in coming up with a more appropriate name for the new > file. > >> >> MAINTAINERS | 5 + >> accel/tcg/cpu-exec.c | 9 ++ >> configure | 214 ++++++++++++++++++++++++++++++++++ >> include/qemu/sanitizers.h | 22 ++++ >> meson.build | 3 + >> plugins/core.c | 25 ++++ >> plugins/loader.c | 5 + >> tcg/tci.c | 5 + >> tests/check-block.sh | 18 +-- >> tests/qtest/fuzz/fork_fuzz.ld | 12 +- >> util/main-loop.c | 9 ++ >> util/oslib-posix.c | 9 ++ >> 12 files changed, 328 insertions(+), 8 deletions(-) >> create mode 100644 include/qemu/sanitizers.h > > although I don't see a new file by that name here, so perhaps the v1 > overview is now stale? > Correct, the v1 overview is stale on that regard. V2 is not using a "broken" file anymore. CFI is now disabled by using an attribute directly on the code. From the v2 overview: * Instead of disabling CFI in specific functions by using a filter file, disable cfi by using a new decorator to be prefixed to the function definition. Beside the removal of a non-inclusive term, I believe this is a better way to track functions, since it is directly inside the code so everyone working on those functions will see it immediately. It's safer with regards of function naming changes and, hopefully, this will make maintaining cfi easier.
On Fri, Oct 23, 2020 at 03:33:31PM -0500, Eric Blake wrote: > On 10/23/20 3:06 PM, Daniele Buono wrote: > > v2: Several months (and structural changes in QEMU) have passed since v1. > > While the spirit of the patch is similar, the implementation is changed > > in multiple points, and should address most if not all the comments > > received in v1. > > > 5) Most of the logic to enable CFI goes in the configure, since it's > > just a matter of checking for dependencies and incompatible options. > > However, I had to disable CFI checks for a few TCG functions. > > This can only be done through a blacklist file. I added a file in the > > root of QEMU, called cfi-blacklist.txt for such purpose. I am open to > > suggestions on where the file should go, and I am willing to become the > > maintainer of it, if deemed necessary. > > In the meantime, we have commits like: > > commit b199c682f1f0aaee22b2170a5fb885250057eec2 > Author: Philippe Mathieu-Daudé <philmd@redhat.com> > Date: Thu Sep 10 09:01:31 2020 +0200 > > target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken() > > In order to use inclusive terminology, rename host_tsx_blacklisted() > as host_tsx_broken(). > > which may help you in coming up with a more appropriate name for the new > file. Something like cfi-exclude-list.txt or cfi-skip-list.txt seems reasonable Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 23/10/20 22:06, Daniele Buono wrote: > This patch allows to compile QEMU with link-time optimization (LTO). > Compilation with LTO is handled directly by meson. This patch adds checks > in configure to make sure the toolchain supports LTO. > > Currently, allow LTO only with clang, since I have found a couple of issues > with gcc-based LTO. > > In case fuzzing is enabled, automatically switch to llvm's linker (lld). > The standard bfd linker has a bug where function wrapping (used by the fuzz* > targets) is used in conjunction with LTO. > > Tested with all major versions of clang from 6 to 12 > > Signed-off-by: Daniele Buono <dbuono@linux.vnet.ibm.com> What are the problems like if you have GCC or you ar/linker are not up to the job? I wouldn't mind omitting the tests since this has to be enabled explicitly by the user. Paolo
On Mon, Oct 26, 2020 at 10:51:43AM +0100, Paolo Bonzini wrote: > On 23/10/20 22:06, Daniele Buono wrote: > > This patch allows to compile QEMU with link-time optimization (LTO). > > Compilation with LTO is handled directly by meson. This patch adds checks > > in configure to make sure the toolchain supports LTO. > > > > Currently, allow LTO only with clang, since I have found a couple of issues > > with gcc-based LTO. > > > > In case fuzzing is enabled, automatically switch to llvm's linker (lld). > > The standard bfd linker has a bug where function wrapping (used by the fuzz* > > targets) is used in conjunction with LTO. > > > > Tested with all major versions of clang from 6 to 12 > > > > Signed-off-by: Daniele Buono <dbuono@linux.vnet.ibm.com> > > What are the problems like if you have GCC or you ar/linker are not up > to the job? I wouldn't mind omitting the tests since this has to be > enabled explicitly by the user. We temporarily disabled LTO in Fedora rawhide due to GCC bugs causing wierd test suite asserts. Those were pre-release versions of GCC/binutils though. I've just tested again and LTO works correctly, so I've enabled LTO once again. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
In terms of ar and linker, if you don't have the right mix it will just stop at link time with an error. In terms of using gcc the errors may be a bit more subtle, similar to what Daniel mentioned. Succesfully compiling but then showing issues at runtime or in the test suite. I'm using ubuntu 18.04 and the stock compiler (based on gcc 7.5) issues a bunch of warnings but compile succesfully with LTO. However, the tcg binary for sparc64 is broken. System-wide emulation stops in OpenFirmware with an exception. User emulation triggers a segmentation fault in some of the test cases. If I compile QEMU with --enable-debug the tests magically work. I briefly tested with gcc-9 and that seemed to work ok, buy your mileage may vary On 10/26/2020 11:50 AM, Daniel P. Berrangé wrote: > On Mon, Oct 26, 2020 at 10:51:43AM +0100, Paolo Bonzini wrote: >> On 23/10/20 22:06, Daniele Buono wrote: >>> This patch allows to compile QEMU with link-time optimization (LTO). >>> Compilation with LTO is handled directly by meson. This patch adds checks >>> in configure to make sure the toolchain supports LTO. >>> >>> Currently, allow LTO only with clang, since I have found a couple of issues >>> with gcc-based LTO. >>> >>> In case fuzzing is enabled, automatically switch to llvm's linker (lld). >>> The standard bfd linker has a bug where function wrapping (used by the fuzz* >>> targets) is used in conjunction with LTO. >>> >>> Tested with all major versions of clang from 6 to 12 >>> >>> Signed-off-by: Daniele Buono <dbuono@linux.vnet.ibm.com> >> >> What are the problems like if you have GCC or you ar/linker are not up >> to the job? I wouldn't mind omitting the tests since this has to be >> enabled explicitly by the user. > > We temporarily disabled LTO in Fedora rawhide due to GCC bugs causing > wierd test suite asserts. Those were pre-release versions of GCC/binutils > though. I've just tested again and LTO works correctly, so I've enabled > LTO once again. > > Regards, > Daniel >
On Tue, Oct 27, 2020 at 10:57:14AM -0400, Daniele Buono wrote: > In terms of ar and linker, if you don't have the right mix it will just > stop at link time with an error. > > In terms of using gcc the errors may be a bit more subtle, similar to > what Daniel mentioned. Succesfully compiling but then showing issues at > runtime or in the test suite. > > I'm using ubuntu 18.04 and the stock compiler (based on gcc 7.5) issues > a bunch of warnings but compile succesfully with LTO. > However, the tcg binary for sparc64 is broken. System-wide emulation > stops in OpenFirmware with an exception. User emulation triggers a > segmentation fault in some of the test cases. If I compile QEMU with > --enable-debug the tests magically work. > > I briefly tested with gcc-9 and that seemed to work ok, buy your mileage > may vary This why we shouldn't artificially block use of LTO with GCC in the configure script. It blocks completely legitimate usage of LTO with GCC versions where it works. The user can detect if their version of GCC is broken by running the test suite during their build process, which is best practice already, and actually testing the result. > > On 10/26/2020 11:50 AM, Daniel P. Berrangé wrote: > > On Mon, Oct 26, 2020 at 10:51:43AM +0100, Paolo Bonzini wrote: > > > On 23/10/20 22:06, Daniele Buono wrote: > > > > This patch allows to compile QEMU with link-time optimization (LTO). > > > > Compilation with LTO is handled directly by meson. This patch adds checks > > > > in configure to make sure the toolchain supports LTO. > > > > > > > > Currently, allow LTO only with clang, since I have found a couple of issues > > > > with gcc-based LTO. > > > > > > > > In case fuzzing is enabled, automatically switch to llvm's linker (lld). > > > > The standard bfd linker has a bug where function wrapping (used by the fuzz* > > > > targets) is used in conjunction with LTO. > > > > > > > > Tested with all major versions of clang from 6 to 12 > > > > > > > > Signed-off-by: Daniele Buono <dbuono@linux.vnet.ibm.com> > > > > > > What are the problems like if you have GCC or you ar/linker are not up > > > to the job? I wouldn't mind omitting the tests since this has to be > > > enabled explicitly by the user. > > > > We temporarily disabled LTO in Fedora rawhide due to GCC bugs causing > > wierd test suite asserts. Those were pre-release versions of GCC/binutils > > though. I've just tested again and LTO works correctly, so I've enabled > > LTO once again. > > > > Regards, > > Daniel > > > Regards, Daniel
Ok, no problem. I can definitely disable the check on GCC. Paolo, would you like me to disable checks on AR/linker for lto too? If so, should I add some of this information on a document, perhaps docs/devel/lto.rst, so it is written somewhere for future uses? -- Btw, using lto with gcc I found another interesting warning here (adding scsi maintainer so they can chip in on the solution): In function 'scsi_disk_new_request_dump', inlined from 'scsi_new_request' at ../qemu-cfi-v3/hw/scsi/scsi-disk.c:2588:9: ../qemu-cfi-v3/hw/scsi/scsi-disk.c:2562:17: warning: argument 1 value '18446744073709551612' exceeds maximum object size 9223372036854775807 [-Walloc-size-larger-than=] line_buffer = g_malloc(len * 5 + 1); ^ ../qemu-cfi-v3/hw/scsi/scsi-disk.c: In function 'scsi_new_request': /usr/include/glib-2.0/glib/gmem.h:78:10: note: in a call to allocation function 'g_malloc' declared here gpointer g_malloc (gsize n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1); This seems like a bug to me. len is a signed integer filled up by scsi_cdb_length which can return -1 if it can't decode the command. What would probably happen is that we try a g_malloc with something too big and that would fail. However, scsi_disk_new_request_dump is used for tracing and: a) I believe an unknown command here is a possibility, and is handled by the caller - scsi_new_request - that has the following: command = buf[0]; ops = scsi_disk_reqops_dispatch[command]; if (!ops) { ops = &scsi_disk_emulate_reqops; } so a termination here on the malloc is probably not desired. b) In the tracing, we should probably print the content of the buffer anyway, so that the unknown command can be debugged. However, I don't know what size I should use here. I'm thinking either 1, to print just the command header in the buffer, or the max size of the buffer, which I am not sure how to get. Ideas or you prefer having an initial patch and then discuss it there? On 10/27/2020 11:17 AM, Daniel P. Berrangé wrote: > On Tue, Oct 27, 2020 at 10:57:14AM -0400, Daniele Buono wrote: >> In terms of ar and linker, if you don't have the right mix it will just >> stop at link time with an error. >> >> In terms of using gcc the errors may be a bit more subtle, similar to >> what Daniel mentioned. Succesfully compiling but then showing issues at >> runtime or in the test suite. >> >> I'm using ubuntu 18.04 and the stock compiler (based on gcc 7.5) issues >> a bunch of warnings but compile succesfully with LTO. >> However, the tcg binary for sparc64 is broken. System-wide emulation >> stops in OpenFirmware with an exception. User emulation triggers a >> segmentation fault in some of the test cases. If I compile QEMU with >> --enable-debug the tests magically work. >> >> I briefly tested with gcc-9 and that seemed to work ok, buy your mileage >> may vary > > This why we shouldn't artificially block use of LTO with GCC in > the configure script. It blocks completely legitimate usage of > LTO with GCC versions where it works. > > The user can detect if their version of GCC is broken by running the > test suite during their build process, which is best practice already, > and actually testing the result. > >> >> On 10/26/2020 11:50 AM, Daniel P. Berrangé wrote: >>> On Mon, Oct 26, 2020 at 10:51:43AM +0100, Paolo Bonzini wrote: >>>> On 23/10/20 22:06, Daniele Buono wrote: >>>>> This patch allows to compile QEMU with link-time optimization (LTO). >>>>> Compilation with LTO is handled directly by meson. This patch adds checks >>>>> in configure to make sure the toolchain supports LTO. >>>>> >>>>> Currently, allow LTO only with clang, since I have found a couple of issues >>>>> with gcc-based LTO. >>>>> >>>>> In case fuzzing is enabled, automatically switch to llvm's linker (lld). >>>>> The standard bfd linker has a bug where function wrapping (used by the fuzz* >>>>> targets) is used in conjunction with LTO. >>>>> >>>>> Tested with all major versions of clang from 6 to 12 >>>>> >>>>> Signed-off-by: Daniele Buono <dbuono@linux.vnet.ibm.com> >>>> >>>> What are the problems like if you have GCC or you ar/linker are not up >>>> to the job? I wouldn't mind omitting the tests since this has to be >>>> enabled explicitly by the user. >>> >>> We temporarily disabled LTO in Fedora rawhide due to GCC bugs causing >>> wierd test suite asserts. Those were pre-release versions of GCC/binutils >>> though. I've just tested again and LTO works correctly, so I've enabled >>> LTO once again. >>> >>> Regards, >>> Daniel >>> >> > > Regards, > Daniel >
On 27/10/20 21:42, Daniele Buono wrote: > Ok, no problem. I can definitely disable the check on GCC. > > Paolo, would you like me to disable checks on AR/linker for lto too? > If so, should I add some of this information on a document, perhaps > docs/devel/lto.rst, so it is written somewhere for future uses? I am not sure of the effects. Does it simply effectively disable LTO or is it something worse? I'll look into the SCSI issue. Paolo
Daniele Buono <dbuono@linux.vnet.ibm.com> writes: > In terms of ar and linker, if you don't have the right mix it will just > stop at link time with an error. > > In terms of using gcc the errors may be a bit more subtle, similar to > what Daniel mentioned. Succesfully compiling but then showing issues at > runtime or in the test suite. > > I'm using ubuntu 18.04 and the stock compiler (based on gcc 7.5) issues > a bunch of warnings but compile succesfully with LTO. > However, the tcg binary for sparc64 is broken. sparc64-linux-user? I think that might be in a bit of a bit rotted state - we had to disable running check-tcg on it in CI because of instability so I wouldn't be surprised if messing around with LTO has dug up even more gremlins. > System-wide emulation > stops in OpenFirmware with an exception. User emulation triggers a > segmentation fault in some of the test cases. If I compile QEMU with > --enable-debug the tests magically work. Breakage in both system and linux-user emulation probably points at something in the instruction decode being broken. Shame we don't have a working risu setup for sparc64 to give the instruction handling a proper work out. > > I briefly tested with gcc-9 and that seemed to work ok, buy your mileage > may vary > > On 10/26/2020 11:50 AM, Daniel P. Berrangé wrote: >> On Mon, Oct 26, 2020 at 10:51:43AM +0100, Paolo Bonzini wrote: >>> On 23/10/20 22:06, Daniele Buono wrote: >>>> This patch allows to compile QEMU with link-time optimization (LTO). >>>> Compilation with LTO is handled directly by meson. This patch adds checks >>>> in configure to make sure the toolchain supports LTO. >>>> >>>> Currently, allow LTO only with clang, since I have found a couple of issues >>>> with gcc-based LTO. >>>> >>>> In case fuzzing is enabled, automatically switch to llvm's linker (lld). >>>> The standard bfd linker has a bug where function wrapping (used by the fuzz* >>>> targets) is used in conjunction with LTO. >>>> >>>> Tested with all major versions of clang from 6 to 12 >>>> >>>> Signed-off-by: Daniele Buono <dbuono@linux.vnet.ibm.com> >>> >>> What are the problems like if you have GCC or you ar/linker are not up >>> to the job? I wouldn't mind omitting the tests since this has to be >>> enabled explicitly by the user. >> >> We temporarily disabled LTO in Fedora rawhide due to GCC bugs causing >> wierd test suite asserts. Those were pre-release versions of GCC/binutils >> though. I've just tested again and LTO works correctly, so I've enabled >> LTO once again. >> >> Regards, >> Daniel >>
If LTO is enabled with the wrong linker/ar: - with the checks, it will exit at configure with an error. I can change this in a warning and disabling LTO if preferred. - without the checks compilation will fail If LTO is enabled with the wrong compiler (e.g. old gcc), you may get a bunch of warnings at compile time, and a binary that won't pass some of the tests in make check. On 10/28/2020 2:44 AM, Paolo Bonzini wrote: > On 27/10/20 21:42, Daniele Buono wrote: >> Ok, no problem. I can definitely disable the check on GCC. >> >> Paolo, would you like me to disable checks on AR/linker for lto too? >> If so, should I add some of this information on a document, perhaps >> docs/devel/lto.rst, so it is written somewhere for future uses? > > I am not sure of the effects. Does it simply effectively disable LTO or > is it something worse? > > I'll look into the SCSI issue. > > Paolo >
On 10/28/2020 5:35 AM, Alex Bennée wrote: > Breakage in both system and linux-user emulation probably points at > something in the instruction decode being broken. Shame we don't have a > working risu setup for sparc64 to give the instruction handling a proper > work out. This is what I'm thinking too. Interesting bit is that sparc32 seem to work fine, and it should be the same codebase. I played a bit with a couple of days but couldn't isolate the faulty instruction. But I'd be happy to work on this issue with someone, perhaps from the sparc maintainers, to see if we can find out what's happening
On 28/10/20 19:22, Daniele Buono wrote: > If LTO is enabled with the wrong linker/ar: > - with the checks, it will exit at configure with an error. I can change > this in a warning and disabling LTO if preferred. > - without the checks compilation will fail > > If LTO is enabled with the wrong compiler (e.g. old gcc), you may get a > bunch of warnings at compile time, and a binary that won't pass some of > the tests in make check. I think both of these count as user error or compiler bug, which we generally don't protect against. There is one exception. We check if the C++ compiler driver can link object files produced by the C compiler driver; this issue arises if the driver used for compilation (C) is GCC and the driver used for linking (C++) is clang, because GCC and clang's sanitizer libraries are not compatible with each other. I think however that in this case the problem is not one of compatibility, but just a broken install, so I think we can just ignore and just forward b_lto. Paolo