From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Daniele Buono" <dbuono@linux.vnet.ibm.com>
Subject: [PULL v2 04/15] gitlab-ci.yml: Add jobs to test CFI flags
Date: Wed, 10 Mar 2021 15:59:51 +0000 [thread overview]
Message-ID: <20210310160002.11659-5-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210310160002.11659-1-alex.bennee@linaro.org>
From: Daniele Buono <dbuono@linux.vnet.ibm.com>
QEMU has had options to enable control-flow integrity features
for a few months now. Add two sets of build/check/acceptance
jobs to ensure the binary produced is working fine.
The three sets allow testing of x86_64 binaries for x86_64, s390x,
ppc64 and aarch64 targets
[AJB: tweak job names to avoid brands]
Signed-off-by: Daniele Buono <dbuono@linux.vnet.ibm.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210304030948.9367-3-dbuono@linux.vnet.ibm.com>
Message-Id: <20210305092328.31792-9-alex.bennee@linaro.org>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 814f51873f..b23364bf3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -483,6 +483,125 @@ clang-user:
--extra-cflags=-fsanitize=undefined --extra-cflags=-fno-sanitize-recover=undefined
MAKE_CHECK_ARGS: check-unit check-tcg
+# Set LD_JOBS=1 because this requires LTO and ld consumes a large amount of memory.
+# On gitlab runners, default value sometimes end up calling 2 lds concurrently and
+# triggers an Out-Of-Memory error
+#
+# Since slirp callbacks are used in QEMU Timers, slirp needs to be compiled together
+# with QEMU and linked as a static library to avoid false positives in CFI checks.
+# This can be accomplished by using -enable-slirp=git, which avoids the use of
+# a system-wide version of the library
+#
+# Split in three sets of build/check/acceptance to limit the execution time of each
+# job
+build-cfi-aarch64:
+ <<: *native_build_job_definition
+ needs:
+ - job: amd64-fedora-container
+ variables:
+ LD_JOBS: 1
+ AR: llvm-ar
+ IMAGE: fedora
+ CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-cfi --enable-cfi-debug
+ --enable-safe-stack --enable-slirp=git
+ TARGETS: aarch64-softmmu
+ MAKE_CHECK_ARGS: check-build
+ artifacts:
+ expire_in: 2 days
+ paths:
+ - build
+
+check-cfi-aarch64:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-cfi-aarch64
+ artifacts: true
+ variables:
+ IMAGE: fedora
+ MAKE_CHECK_ARGS: check
+
+acceptance-cfi-aarch64:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-cfi-aarch64
+ artifacts: true
+ variables:
+ IMAGE: fedora
+ MAKE_CHECK_ARGS: check-acceptance
+ <<: *acceptance_definition
+
+build-cfi-ppc64-s390x:
+ <<: *native_build_job_definition
+ needs:
+ - job: amd64-fedora-container
+ variables:
+ LD_JOBS: 1
+ AR: llvm-ar
+ IMAGE: fedora
+ CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-cfi --enable-cfi-debug
+ --enable-safe-stack --enable-slirp=git
+ TARGETS: ppc64-softmmu s390x-softmmu
+ MAKE_CHECK_ARGS: check-build
+ artifacts:
+ expire_in: 2 days
+ paths:
+ - build
+
+check-cfi-ppc64-s390x:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-cfi-ppc64-s390x
+ artifacts: true
+ variables:
+ IMAGE: fedora
+ MAKE_CHECK_ARGS: check
+
+acceptance-cfi-ppc64-s390x:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-cfi-ppc64-s390x
+ artifacts: true
+ variables:
+ IMAGE: fedora
+ MAKE_CHECK_ARGS: check-acceptance
+ <<: *acceptance_definition
+
+build-cfi-x86_64:
+ <<: *native_build_job_definition
+ needs:
+ - job: amd64-fedora-container
+ variables:
+ LD_JOBS: 1
+ AR: llvm-ar
+ IMAGE: fedora
+ CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-cfi --enable-cfi-debug
+ --enable-safe-stack --enable-slirp=git
+ TARGETS: x86_64-softmmu
+ MAKE_CHECK_ARGS: check-build
+ artifacts:
+ expire_in: 2 days
+ paths:
+ - build
+
+check-cfi-x86_64:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-cfi-x86_64
+ artifacts: true
+ variables:
+ IMAGE: fedora
+ MAKE_CHECK_ARGS: check
+
+acceptance-cfi-x86_64:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-cfi-x86_64
+ artifacts: true
+ variables:
+ IMAGE: fedora
+ MAKE_CHECK_ARGS: check-acceptance
+ <<: *acceptance_definition
+
tsan-build:
<<: *native_build_job_definition
variables:
--
2.20.1
next prev parent reply other threads:[~2021-03-10 16:11 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 15:59 [PULL v2 00/15] testing, docs, semihosting move and guest-loader Alex Bennée
2021-03-10 15:59 ` [PULL v2 01/15] docs/system: add a gentle prompt for the complexity to come Alex Bennée
2021-03-10 15:59 ` [PULL v2 02/15] tests/docker: add a test-tcg for building then running check-tcg Alex Bennée
2021-03-10 15:59 ` [PULL v2 03/15] gitlab-ci.yml: Allow custom # of parallel linkers Alex Bennée
2021-03-10 15:59 ` Alex Bennée [this message]
2021-03-22 13:39 ` [PULL v2 04/15] gitlab-ci.yml: Add jobs to test CFI flags Philippe Mathieu-Daudé
2021-03-22 14:06 ` Alex Bennée
2021-03-22 14:08 ` Daniele Buono
2021-03-10 15:59 ` [PULL v2 05/15] tests/docker: Use --arch-only when building Debian cross image Alex Bennée
2021-03-10 15:59 ` [PULL v2 06/15] .editorconfig: update the automatic mode setting for Emacs Alex Bennée
2021-03-10 15:59 ` [PULL v2 07/15] hw/board: promote fdt from ARM VirtMachineState to MachineState Alex Bennée
2021-03-10 15:59 ` [PULL v2 08/15] hw/riscv: migrate fdt field to generic MachineState Alex Bennée
2021-03-10 15:59 ` [PULL v2 09/15] device_tree: add qemu_fdt_setprop_string_array helper Alex Bennée
2021-03-10 15:59 ` [PULL v2 10/15] hw/core: implement a guest-loader to support static hypervisor guests Alex Bennée
2021-03-10 15:59 ` [PULL v2 11/15] docs: move generic-loader documentation into the main manual Alex Bennée
2021-03-10 15:59 ` [PULL v2 12/15] docs: add some documentation for the guest-loader Alex Bennée
2021-03-10 16:00 ` [PULL v2 13/15] tests/avocado: add boot_xen tests Alex Bennée
2021-03-10 16:00 ` [PULL v2 14/15] semihosting: Move include/hw/semihosting/ -> include/semihosting/ Alex Bennée
2021-03-10 16:00 ` [PULL v2 15/15] semihosting: Move hw/semihosting/ -> semihosting/ Alex Bennée
2021-03-11 18:55 ` [PULL v2 00/15] testing, docs, semihosting move and guest-loader Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210310160002.11659-5-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=dbuono@linux.vnet.ibm.com \
--cc=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).