From: Daniele Buono <dbuono@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Daniele Buono" <dbuono@linux.vnet.ibm.com>
Subject: [PATCH v2 2/2] gitlab-ci.yml: Add jobs to test CFI flags
Date: Fri, 26 Feb 2021 10:21:08 -0500 [thread overview]
Message-ID: <20210226152108.7848-3-dbuono@linux.vnet.ibm.com> (raw)
In-Reply-To: <20210226152108.7848-1-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 two sets allow testing of x86_64 binaries for every target
that is not deprecated.
Signed-off-by: Daniele Buono <dbuono@linux.vnet.ibm.com>
---
.gitlab-ci.yml | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 93 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 814f51873f..15641abe63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -483,6 +483,99 @@ 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 two sets of build/check/acceptance because a single build job for every
+# target creates an artifact archive too big to be uploaded
+build-cfi-set1:
+ <<: *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 arm-softmmu alpha-softmmu i386-softmmu ppc-softmmu
+ ppc64-softmmu riscv32-softmmu riscv64-softmmu s390x-softmmu sparc-softmmu
+ sparc64-softmmu x86_64-softmmu
+ aarch64-linux-user aarch64_be-linux-user arm-linux-user i386-linux-user
+ ppc64-linux-user ppc64le-linux-user s390x-linux-user x86_64-linux-user
+ MAKE_CHECK_ARGS: check-build
+ timeout: 2h 30m
+ artifacts:
+ expire_in: 2 days
+ paths:
+ - build
+
+check-cfi-set1:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-cfi-set1
+ artifacts: true
+ variables:
+ IMAGE: fedora
+ MAKE_CHECK_ARGS: check
+
+acceptance-cfi-set1:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-cfi-set1
+ artifacts: true
+ variables:
+ IMAGE: fedora
+ MAKE_CHECK_ARGS: check-acceptance
+ <<: *acceptance_definition
+
+build-cfi-set2:
+ <<: *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: avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu
+ microblaze-softmmu microblazeel-softmmu mips-softmmu mips64-softmmu
+ mips64el-softmmu mipsel-softmmu moxie-softmmu nios2-softmmu or1k-softmmu
+ rx-softmmu sh4-softmmu sh4eb-softmmu tricore-softmmu xtensa-softmmu
+ xtensaeb-softmmu
+ MAKE_CHECK_ARGS: check-build
+ timeout: 2h 30m
+ artifacts:
+ expire_in: 2 days
+ paths:
+ - build
+
+check-cfi-set2:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-cfi-set2
+ artifacts: true
+ variables:
+ IMAGE: fedora
+ MAKE_CHECK_ARGS: check
+
+acceptance-cfi-set2:
+ <<: *native_test_job_definition
+ needs:
+ - job: build-cfi-set2
+ artifacts: true
+ variables:
+ IMAGE: fedora
+ MAKE_CHECK_ARGS: check-acceptance
+ <<: *acceptance_definition
+
tsan-build:
<<: *native_build_job_definition
variables:
--
2.30.0
next prev parent reply other threads:[~2021-02-26 15:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 15:21 [PATCH v2 0/2] gitlab-ci.yml: Add jobs to test CFI Daniele Buono
2021-02-26 15:21 ` [PATCH v2 1/2] gitlab-ci.yml: Allow custom # of parallel linkers Daniele Buono
2021-02-26 15:21 ` Daniele Buono [this message]
2021-03-01 10:06 ` [PATCH v2 0/2] gitlab-ci.yml: Add jobs to test CFI Daniel P. Berrangé
2021-03-01 14:59 ` Daniele Buono
2021-03-01 15:08 ` Daniel P. Berrangé
2021-03-01 20:39 ` Daniele Buono
2021-03-02 10:30 ` Daniel P. Berrangé
2021-03-02 13:18 ` Daniele Buono
2021-03-02 15:38 ` Daniel P. Berrangé
2021-03-02 16:31 ` Daniele Buono
2021-03-02 16:40 ` Daniel P. Berrangé
2021-03-02 21:01 ` Daniele Buono
2021-03-03 10:04 ` Daniel P. Berrangé
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=20210226152108.7848-3-dbuono@linux.vnet.ibm.com \
--to=dbuono@linux.vnet.ibm.com \
--cc=alex.bennee@linaro.org \
--cc=pbonzini@redhat.com \
--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).