From patchwork Wed Sep 11 06:46:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 827360 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp657361wrc; Tue, 10 Sep 2024 23:48:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVw9mJcReFKCj6i4yYfH12Ex1XuGBcVfJXb4NjYVu7zKUo2taTltd7KHT15OgnJOpPj4AmqwQ==@linaro.org X-Google-Smtp-Source: AGHT+IGW/HIDMJ4klKF2DRmdWUbSPYodXVW5c1ubpoWeQFiIvH+mx1KO9jDAom50jgpFWFiGQjXw X-Received: by 2002:a05:6214:5b06:b0:6c5:52d5:b21b with SMTP id 6a1803df08f44-6c552d5b2f4mr95361876d6.4.1726037310319; Tue, 10 Sep 2024 23:48:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726037310; cv=none; d=google.com; s=arc-20240605; b=lZNIasi+8WMHDDLFQ52Q9knjA9ZV26ISCxtnkDgSGWRpev6T/AKYm+x6I8FI38ITc1 q33TJBymn8PrEyMrBRx5ct3gW8KJ7lEhore0ia4buwpDb7oVaEDSVYVqXbwim+rVPHf5 KOJI7Ot21/eTnqkPPYd8dCS81UGdulQ1PtOQI8066ZFap6uFmumfrcEBmRmcAgXUQOIh y2xBDV90Vpwi/Nx10UHY1DTjVK3cGTcrNIF9WBTqGkQ9YzJo/gfhFC3TsDAc42m/lVOd /0p7UhQzelMdT3HljoXhV2/GDWiicVyr8kZVkeDMvuNyzrgfF2VNVgEZ0SHT+ckYjCv1 05cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=atAnxq10EvDM7H/EYCXHNSwcUVJ4IHzvbjhmUrY4yrA=; fh=J5qo5pIy/h0P+9UFq5/4z3adjJU9G/qgGGvMxU2E8s8=; b=ek2yKoDpNJnNfBEdRKz1rUJ+AJxG3K9CDIjwNAXFjxNxXYjHSvgHKhqR847uqLkh7p mc3x8hGoxlwo9rLMeVXaVl88zDBYruifyBDeW9amLQXCUA3UZNo2JsgUTLPMZ9ZqER4u zyvrS5JwvQmapQ4MIaOclBcFiCscbZOW4ENWRCkyM78q2POpGpLhdFmSqfC4t3q5On4S AgtFhsCFIzM2mwe2u1tE9I6L29BVO3PeabBb2vqSFl+c4rUDIKQrffWZppbFinVNE+J4 iUUZUH5R21dXEMSozAQtfAzvBFlQ1oy4VBvfWdmgTRWk4fRxu3ymmyMjYv1rhTkArA7Q ZrJg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Vy/esYEL"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6c5348dc4f3si92585026d6.614.2024.09.10.23.48.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2024 23:48:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Vy/esYEL"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soH7x-0000da-82; Wed, 11 Sep 2024 02:46:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soH7t-0000WA-FX for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:53 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soH7q-0004P2-2G for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:53 -0400 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-5c3c34e3c39so8909691a12.2 for ; Tue, 10 Sep 2024 23:46:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726037208; x=1726642008; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=atAnxq10EvDM7H/EYCXHNSwcUVJ4IHzvbjhmUrY4yrA=; b=Vy/esYELTjLfLTkBfnxwgMUzI9Gb9kh/H0fR50InS4klL1+DjZyW/sFupInbJBHLqP JHEfe3sgWKDxK6XIn5/Oi+OsD4hSV9qGAgaQFF/2BYThc4zsy9z2bfdROUzYi0IPSRJ6 DUXLXkVpsrWq6jtuqziR1eZcQIySvxh8YYW1R7jjsSFItoNP55VeiQt/DG2Fl0nehxml xYR7AzDRWjlOA8Bb+owmSkpvf0A3GDn9K35KX0bc9+yvzk3Kg8heKoOTMKf70jvL3XAi hGKkiqEgGg5W6KTB1s0VL047uIhg3Pzx6RLekzBO94QcQmBCypx8SUwP/hUdPApRlcT7 ippg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726037208; x=1726642008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=atAnxq10EvDM7H/EYCXHNSwcUVJ4IHzvbjhmUrY4yrA=; b=naaTvoIxDFdnse6pW3oOGaEL1rAgyo4hOSigyGLzhofurymqcjYloq09UlpaHigUoh qmN1Pfl6597jKwbQqhd5uYaNZAUy4VFhEENZ975VqR4jz9MPVXl43Rm6LENeTn+jWkj/ 42qOHlMzzVNi9E1vmvYkiWrZMCLACD2NmNSOczbju2fjOlWrkA1SJ1VQGOM3dka0JhfQ 6YzbmzYKSWQ1rG0IaqGP4DggnOUkjaNa7JrydO/kfcOdZuxmhAPvy9gihIXkGIVyNd0Z pvDM583h9LWOoR2mUNkLkZFKmGP+iwhiT3k9g95ScecBJAsEVekOW6rq50554wm4ZYhl BXXw== X-Gm-Message-State: AOJu0YwaAuE5/Ww5XIfzuVueu1apFP49995J621+itMm1h4jH6NU9Lo1 AJ2SY9ip3cFQpe0kh0LvFN1rdIrmupoGQ6zytyWdPsWVH/OFTe4XxeHzuf30lUlqZkN4scQY8hm ZCgc= X-Received: by 2002:a17:907:ea7:b0:a8a:18f9:269f with SMTP id a640c23a62f3a-a8ffae18cb9mr256482966b.60.1726037207531; Tue, 10 Sep 2024 23:46:47 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25c7286esm568418366b.138.2024.09.10.23.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 23:46:47 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 275755F9CC; Wed, 11 Sep 2024 07:46:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Richard Henderson , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 01/10] tests/docker: remove debian-armel-cross Date: Wed, 11 Sep 2024 07:46:36 +0100 Message-Id: <20240911064645.357592-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911064645.357592-1-alex.bennee@linaro.org> References: <20240911064645.357592-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x529.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org As debian-11 transitions to LTS we are starting to have problems building the image. While we could update to a later Debian building a 32 bit QEMU without modern floating point is niche host amongst the few remaining 32 bit hosts we regularly build for. For now we still have armhf-debian-cross-container which is currently built from the more recent debian-12. Reviewed-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20240910173900.4154726-2-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index e3103940a0..9a3ebd885e 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -22,12 +22,6 @@ arm64-debian-cross-container: variables: NAME: debian-arm64-cross -armel-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-armel-cross - armhf-debian-cross-container: extends: .container_job_template stage: containers diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index cb499e4ee0..459273f9da 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,13 +1,6 @@ include: - local: '/.gitlab-ci.d/crossbuild-template.yml' -cross-armel-user: - extends: .cross_user_build_job - needs: - job: armel-debian-cross-container - variables: - IMAGE: debian-armel-cross - cross-armhf-user: extends: .cross_user_build_job needs: diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker deleted file mode 100644 index 8476fc8cce..0000000000 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ /dev/null @@ -1,179 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross-arch armv6l debian-11 qemu -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcc \ - gcovr \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libgtk-vnc-2.0-dev \ - libpcre2-dev \ - libsndio-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - mtools \ - ncat \ - ninja-build \ - openssh-client \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-setuptools \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-wheel \ - python3-yaml \ - rpm2cpio \ - sed \ - socat \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - xorriso \ - zstd && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - -RUN /usr/bin/pip3 install tomli - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture armel && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-arm-linux-gnueabi \ - libaio-dev:armel \ - libasan6:armel \ - libasound2-dev:armel \ - libattr1-dev:armel \ - libbpf-dev:armel \ - libbrlapi-dev:armel \ - libbz2-dev:armel \ - libc6-dev:armel \ - libcacard-dev:armel \ - libcap-ng-dev:armel \ - libcapstone-dev:armel \ - libcmocka-dev:armel \ - libcurl4-gnutls-dev:armel \ - libdaxctl-dev:armel \ - libdrm-dev:armel \ - libepoxy-dev:armel \ - libfdt-dev:armel \ - libffi-dev:armel \ - libfuse3-dev:armel \ - libgbm-dev:armel \ - libgcrypt20-dev:armel \ - libglib2.0-dev:armel \ - libglusterfs-dev:armel \ - libgnutls28-dev:armel \ - libgtk-3-dev:armel \ - libibverbs-dev:armel \ - libiscsi-dev:armel \ - libjemalloc-dev:armel \ - libjpeg62-turbo-dev:armel \ - libjson-c-dev:armel \ - liblttng-ust-dev:armel \ - liblzo2-dev:armel \ - libncursesw5-dev:armel \ - libnfs-dev:armel \ - libnuma-dev:armel \ - libpam0g-dev:armel \ - libpipewire-0.3-dev:armel \ - libpixman-1-dev:armel \ - libpng-dev:armel \ - libpulse-dev:armel \ - librbd-dev:armel \ - librdmacm-dev:armel \ - libsasl2-dev:armel \ - libsdl2-dev:armel \ - libsdl2-image-dev:armel \ - libseccomp-dev:armel \ - libselinux1-dev:armel \ - libslirp-dev:armel \ - libsnappy-dev:armel \ - libspice-server-dev:armel \ - libssh-gcrypt-dev:armel \ - libsystemd-dev:armel \ - libtasn1-6-dev:armel \ - libubsan1:armel \ - libudev-dev:armel \ - liburing-dev:armel \ - libusb-1.0-0-dev:armel \ - libusbredirhost-dev:armel \ - libvdeplug-dev:armel \ - libvirglrenderer-dev:armel \ - libvte-2.91-dev:armel \ - libzstd-dev:armel \ - nettle-dev:armel \ - systemtap-sdt-dev:armel \ - zlib1g-dev:armel && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - printf "[binaries]\n\ -c = '/usr/bin/arm-linux-gnueabi-gcc'\n\ -ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ -strip = '/usr/bin/arm-linux-gnueabi-strip'\n\ -pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'arm'\n\ -cpu = 'arm'\n\ -endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc - -ENV ABI "arm-linux-gnueabi" -ENV MESON_OPTS "--cross-file=arm-linux-gnueabi" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabi- -ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user,armeb-linux-user -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index ac803e34f1..199d5fad87 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -154,12 +154,6 @@ try: trailer=cross_build("aarch64-linux-gnu-", "aarch64-softmmu,aarch64-linux-user")) - # migration to bookworm stalled: https://lists.debian.org/debian-arm/2023/09/msg00006.html - generate_dockerfile("debian-armel-cross", "debian-11", - cross="armv6l", - trailer=cross_build("arm-linux-gnueabi-", - "arm-softmmu,arm-linux-user,armeb-linux-user")) - generate_dockerfile("debian-armhf-cross", "debian-12", cross="armv7l", trailer=cross_build("arm-linux-gnueabihf-", From patchwork Wed Sep 11 06:46:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 827355 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp657239wrc; Tue, 10 Sep 2024 23:47:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUE9UeOHM77MQIji/64WipSjLsnZFFvOyBNUFUFveHnJsBPQR4PJvpbRiJsTrvqXXvUFpM/GQ==@linaro.org X-Google-Smtp-Source: AGHT+IGfVeGDr34ypvoV6r4QDZRg2lNAby9x4S94XZABK4rKre+qmps/Yiw/Ns/enn7dHTRNRLbs X-Received: by 2002:a05:620a:1724:b0:7a9:b9c6:ab4d with SMTP id af79cd13be357-7a9b9c6bb10mr1366844785a.51.1726037279139; Tue, 10 Sep 2024 23:47:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726037279; cv=none; d=google.com; s=arc-20240605; b=OP94YLw52zqeLXByiLrT5DS3DLckDGuiszOZiCxi3svYeGyBIq3njr1nq8cXAA9hc8 nfjC/hASGclYdIwEpAYFK0XZZrVT7RHOyLuGgSJoO9p/FBPNfeZfWaIeL5fSltM20dOL GXZloCl09StLRQn/SyExp7SobBeBjeUM7/WukC5+252hLUh/6ttfyzx4zoenFkJ/D+wD pLehqOAoRMRj/4d0r1QmW3ffV5hX6F2OVESAJCb4Q9wR3KYC2xU3YJDHSr3yW5b+8OBY o0uYw1YCYteymslgBv0awyLmfZs0DiIwLx1XhRHkRrNBC6jQRhZ1lQpRtq5kk0oIi+dW MuDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wfk4OlmPzpXdEoaFjjJFeaEzfslRcj4w5ekMaaS4uFU=; fh=ABt+oDBomZ/EVJEWK3Smf/3ci7fYso0sSATLVWTeEmg=; b=BXY/bCpDTsMy3iEyFt13Py4a8Ks/DE8u8aOhucG62zdVqYIh9SPH7I43VI73iVMgFP 1BxpxEj6iPSw3LMnPaP5n9vphfPV2YrZPYbLAH/+Hz/PjAT0prREXWoEzTrNDs56h3hx 0TQlp1W1fMCySSPQ1lr1XOZwKoEWn1p27VQHqF3pPLesZ7MA+mwWa2ZEt8gIFNhFP2A5 HmqfbGGXTUrXMbGnVoSjQb3xVoFdt7lfsf/GDg6kemKfZ/EDSqzKQoQQG0+7349SxulW 4pdDLqUcFxQXKQ2uiUi0I/aHDq9E/m5jkAvPOIzhTVR5Mp951MwPaSJc+3VMghbM/fMh EUmQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=c0NrCX4P; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a9a79c645asi957120285a.45.2024.09.10.23.47.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2024 23:47:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=c0NrCX4P; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soH7y-0000hM-1C; Wed, 11 Sep 2024 02:46:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soH7v-0000Xp-JI for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:55 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soH7r-0004PG-AX for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:54 -0400 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5bef295a429so7329890a12.2 for ; Tue, 10 Sep 2024 23:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726037209; x=1726642009; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wfk4OlmPzpXdEoaFjjJFeaEzfslRcj4w5ekMaaS4uFU=; b=c0NrCX4PSEmd2b5rTLxYDTemi8qK0NuJaZjUEQ3i2XD0qtB9wFbwpMjJMyDxmxWEMP ZFXz5xWWKo1CSmGmCJB87vEKSke1L54BlxOan/UpwSgiL8Jmz1NAuXDH+qu36r/ASTV4 gbB4sy8RIkrycmz8tJzWE1SrFmN7SjMFq3FMVFT6S396t4JlSHvyY5+5nlKRzBNXb7R9 36ecAxNoHQoTOX27X3JZhk/0ccYi3eGe7nGY2Wd1R0wlGhhTyEJfnAW+qSY2+iQgdesa AT4Bakhi0ry6B6UNgUacwf0wu8UO6Atmsjv5SXauN0QAkcD96aZ7YTyYjgwAIbnQqfEP a7OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726037209; x=1726642009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wfk4OlmPzpXdEoaFjjJFeaEzfslRcj4w5ekMaaS4uFU=; b=tlnbdrekfcTwg7/KY3Usq155mrOwAoAIybhgqjHyEYI16fZNYBeboTZ1sgAgSJwrBZ 0V+yj5CDoKymamLs53zf2tx+TSN8ejAMS9L27ssKrt5QmUuoymb8ar5q3i4q2rxaDeLb L4gV/gsiYrIlp0X3MenNqumv1e4McG1Wi6PBwiid+93cYWxVup/DPITcIj1pA13vsWNY tVhyqZuu6XtQyRIXCh0ZXocOwDx5fNmi8hRkTrWpeOteqzjWHdYlJRB+M11vJYjgFPES ux+iFGhpmYR/A4UGtZm2syz0CtnPX5+L/5mkV3h5QQZKMYXgy2sLIKsU0bBKn3+MZ62v 0AFQ== X-Gm-Message-State: AOJu0Yxz92deaQA0YuwU0tS11cr+DOmrEAyzPinCBD+KcGhBJTDKkrpL AEtYbe3XTdHrVOX/KkESVWQOQKGM6EkXJAbSDmx1YwiyK4TmxwmTBVOASuE62n4= X-Received: by 2002:a05:6402:2691:b0:5a2:5bd2:ca50 with SMTP id 4fb4d7f45d1cf-5c3dc7bad6amr12297164a12.25.1726037208430; Tue, 10 Sep 2024 23:46:48 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd76fcfsm5036039a12.65.2024.09.10.23.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 23:46:47 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 411285F9CE; Wed, 11 Sep 2024 07:46:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Jiaxun Yang Subject: [PULL 02/10] tests/docker: update debian i686 and mipsel images to bookworm Date: Wed, 11 Sep 2024 07:46:37 +0100 Message-Id: <20240911064645.357592-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911064645.357592-1-alex.bennee@linaro.org> References: <20240911064645.357592-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Whatever issues there were which stopped these being updates when the rest were have now been resolved. However mips64el continues to be broken so don't update it here. Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20240910173900.4154726-3-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker index 3fe8ee623d..2328ee1732 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross-arch i686 debian-11 qemu +# $ lcitool dockerfile --layers all --cross-arch i686 debian-12 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:12-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -48,16 +48,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-opencv \ python3-pillow \ python3-pip \ - python3-setuptools \ python3-sphinx \ python3-sphinx-rtd-theme \ python3-venv \ - python3-wheel \ python3-yaml \ rpm2cpio \ sed \ socat \ sparse \ + swtpm \ tar \ tesseract-ocr \ tesseract-ocr-eng \ @@ -69,8 +68,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-reconfigure locales && \ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED -RUN /usr/bin/pip3 install tomli - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -145,6 +142,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvdeplug-dev:i386 \ libvirglrenderer-dev:i386 \ libvte-2.91-dev:i386 \ + libxdp-dev:i386 \ libzstd-dev:i386 \ nettle-dev:i386 \ systemtap-sdt-dev:i386 \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 0d559ae4ba..4ac314e22e 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross-arch mipsel debian-11 qemu +# $ lcitool dockerfile --layers all --cross-arch mipsel debian-12 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:12-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -48,16 +48,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-opencv \ python3-pillow \ python3-pip \ - python3-setuptools \ python3-sphinx \ python3-sphinx-rtd-theme \ python3-venv \ - python3-wheel \ python3-yaml \ rpm2cpio \ sed \ socat \ sparse \ + swtpm \ tar \ tesseract-ocr \ tesseract-ocr-eng \ @@ -69,8 +68,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-reconfigure locales && \ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED -RUN /usr/bin/pip3 install tomli - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -143,6 +140,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvdeplug-dev:mipsel \ libvirglrenderer-dev:mipsel \ libvte-2.91-dev:mipsel \ + libxdp-dev:mipsel \ libzstd-dev:mipsel \ nettle-dev:mipsel \ systemtap-sdt-dev:mipsel \ diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 199d5fad87..c60490a7fa 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -159,7 +159,7 @@ try: trailer=cross_build("arm-linux-gnueabihf-", "arm-softmmu,arm-linux-user")) - generate_dockerfile("debian-i686-cross", "debian-11", + generate_dockerfile("debian-i686-cross", "debian-12", cross="i686", trailer=cross_build("i686-linux-gnu-", "x86_64-softmmu," @@ -171,7 +171,7 @@ try: trailer=cross_build("mips64el-linux-gnuabi64-", "mips64el-softmmu,mips64el-linux-user")) - generate_dockerfile("debian-mipsel-cross", "debian-11", + generate_dockerfile("debian-mipsel-cross", "debian-12", cross="mipsel", trailer=cross_build("mipsel-linux-gnu-", "mipsel-softmmu,mipsel-linux-user")) From patchwork Wed Sep 11 06:46:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 827362 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp657416wrc; Tue, 10 Sep 2024 23:48:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU+Q3zbdZiqyOkKCSrVQAUlaHMHNQn2IXXz6tqUtfVEESSCI8JnQlHhVaQhkvwYkE+V0wxeEg==@linaro.org X-Google-Smtp-Source: AGHT+IHgShic0eU+7fjAC1NmPX1BXyrQZ47tPbLCbUwgQ2INYfH2iW1bnv9wltoh3rRIGGbQ0xOq X-Received: by 2002:ac8:5d91:0:b0:458:32e5:1fe3 with SMTP id d75a77b69052e-45832e5242emr129466311cf.16.1726037323398; Tue, 10 Sep 2024 23:48:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726037323; cv=none; d=google.com; s=arc-20240605; b=eEq761/ORjnKEf9lalZKrYWiDXlKOT51wa326q4i/YVIyt6wV9mI81DLp+g/x5+NtS t1AhKwuzPAHEAdN/34+Gcs0oR+aeH6chBBe7JhLdRpwpHq5IiU0+oJnGBSb6U/nxdN6A vjuQBkwl9nUo8c9ktvNJ7V+e/2z6Q6Gryl9heyt9VBO/ydTAub6MIAcSIKRWX5/pn/tx WD9lECbs+vxLrffjtqcxs9YKaVLjZAWYRUF0k38MAGT3YGl9k3uUWGcMpGRCDYmBOnyA PfX9EVAQiyvXmH4HUds1aPUXI4kgrdyErs9ca7G8vyOUkrHsruPOrmFBhSCicqszNObo wIAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Tx23oVrPLG6g8Ksup34Nr8GIz/4sQ5H+rc6lFUcsHVA=; fh=ZR940MTZPcdFkgOOoQi8yWUJiR+WQ2cmWvwEkdsQEGA=; b=jCKQxoeNTfDoNbvNl+RjkOOPHyWI58Ez2dkUvrkOg4ETOuE30cYfjnufaBX+TdKLcs ytioq6NrUc7ZHYZ+BMEx4o0csQbK/a+fTNvA34Co3e/ZWXiIAexBU9F4bwEd2RNOVeSq akEjLBTpzZUXQKFTOdTFFdGOTv6rVErJM4yWU7Kk+IIjzdmZY2j3+8L9tplYXtr/WjjT gr/DmqVstgQBygg99xguZH42yACiDKGgHtCaluwrCGdm7XuZmSY+QIZ6dpSD2lyJ0mYa 8xp2zqsT0LJqVRp1wnKtaHG9W8UEPeZC85eBwMCD6h1lVjNVoAM7E9bwRXfqle1LdUIm NKnw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ctNjs1HK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-45822f8109dsi91503011cf.453.2024.09.10.23.48.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2024 23:48:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ctNjs1HK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soH7x-0000fh-Nw; Wed, 11 Sep 2024 02:46:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soH7u-0000Wf-6U for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:55 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soH7q-0004P4-37 for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:53 -0400 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-5c260b19f71so6447734a12.1 for ; Tue, 10 Sep 2024 23:46:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726037208; x=1726642008; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Tx23oVrPLG6g8Ksup34Nr8GIz/4sQ5H+rc6lFUcsHVA=; b=ctNjs1HKOrfj7KxMUUpED/y4Ro2/6EFPzBwbQxqxrkJtaaCn5win/Ss58Dfd0u5Zxi Dalz2VOhqaQDdzYMXDkWlOJlbVbQ4Q0ynI22hNXLQDsTyXEKWgOd6olE92Ba8Q2mdTy1 tLpecia+NjcutmhISI/s+Ho2+nDs/pvRwoNrBV8mKv0D8W/A0sd/H9lZ7m08lzdEzM1/ 3QtrlkWIanCNzkWbQxNQ+YQhES5CNgF9BCmxX81tmjtTSsO4+bWe7UkONsrZFojxw6jx h2ZI0/afaVPN8YF1/hEsO4yHbNHsi/DW9kBtcLL2vrpMTZKZvn4isq2X9Sv2fr/74bIM 87IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726037208; x=1726642008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tx23oVrPLG6g8Ksup34Nr8GIz/4sQ5H+rc6lFUcsHVA=; b=XzW03tesY3tofP7pHVsKxRS530mFa9wOEyBJwFBWfVL8Wep3noQ4Jo27AAz9rjLytS Y2FCy8A7MabtN93vnnpp6dQURGhaEqEUglf1j6Wd35ojagzQprXhJ8uTC3Ko9iUIwvuq e2Rn/CXLLtDbs8SNSY0V+Ge2d/DntG0WMQSPYsaNN5+KnwiQfiQ3Jm0J9p5j6oaQJVzA R79jLLDm9gYxV4vQ01JIH7XXnEZe7q0JMETqMPAUQbsEvvomyyXjqQHTPwVpnRuVZz/n Iad8xf3z2dBf19fBC+Rs5AVsI1/sARElWla/G/KMssCWZ8RMGW+WZalfIUGdjpd/NrzL 5nOw== X-Gm-Message-State: AOJu0Yx4E649I3XYOR/vg2gV1zekLyOxwA8qpv3M6sNSDw5V2onM20fh 5qkq2XqBaowz6o/KDbl40yPV8frIxs0kVLQNhxAQHXdJU5HOop34JDQjZbrov+aD7LnDdV18IV4 kPQg= X-Received: by 2002:a17:907:7ea9:b0:a86:8f8f:4761 with SMTP id a640c23a62f3a-a8ffab29500mr272630966b.25.1726037208105; Tue, 10 Sep 2024 23:46:48 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d259526c3sm575089666b.69.2024.09.10.23.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 23:46:47 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 54EE85F9EB; Wed, 11 Sep 2024 07:46:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jiaxun Yang Subject: [PULL 03/10] tests/docker: use debian-all-test-cross for mips64el tests Date: Wed, 11 Sep 2024 07:46:38 +0100 Message-Id: <20240911064645.357592-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911064645.357592-1-alex.bennee@linaro.org> References: <20240911064645.357592-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x532.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org While the mips64el cross compilation environment is busted in Debian we can use the debian-all-test-cross image for building TCG tests like we do in the CI. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20240910173900.4154726-4-alex.bennee@linaro.org> diff --git a/configure b/configure index d08b71f14b..39a284ddfe 100755 --- a/configure +++ b/configure @@ -1328,7 +1328,7 @@ probe_target_compiler() { container_cross_prefix=microblaze-linux-musl- ;; mips64el) - container_image=debian-mips64el-cross + container_image=debian-all-test-cross container_cross_prefix=mips64el-linux-gnuabi64- ;; tricore) From patchwork Wed Sep 11 06:46:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 827356 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp657260wrc; Tue, 10 Sep 2024 23:48:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVO+4vJ46usMafog8+ZK9t3oeSXBjXuMOyJdPGJGzUZlgPXhhbaJaD48xQ2Iq5SVpoOiJAKJg==@linaro.org X-Google-Smtp-Source: AGHT+IFfqMunDbDvUP6bPl4xOOIc+lbgSjnkYlqBaDLpL+d1KyugWYD/E+CE5oY23wJSVLZomcXU X-Received: by 2002:a05:6214:3d9e:b0:6c5:1711:81d7 with SMTP id 6a1803df08f44-6c528527d88mr289757726d6.33.1726037287760; Tue, 10 Sep 2024 23:48:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726037287; cv=none; d=google.com; s=arc-20240605; b=hr/Y/nymV4EsazMUNMwcvQd/0HWtsI/jIKWWLfRQxaN7pahVjunYZa0jAjl1UbuMip o1v6oZJfEb29hEWYFU86hia2pV7UrLLyrqL+6LYBmkR/pAaT4XLLkh6RLU6tTUqMwaMK 3OsejTstYOzMXkVXrl9H3lpw/MlPreoXXbDeVkBB6mWs1KrcmqlrH4anMui59hitaqhl rkM04yg0r3ff+xJYHSgSyofZBzUXEefPm3kiYTBqD16R9s91LeZTAK0IzkzfPHZ6gmE+ ozaz8/WUdfandqUbvBt8OEFtOc/Am4QgkUvXlTUoiCvqaVBiEGpSChsCi7NHtxRE2Q/M s5ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/8ZryqeSlz/ExYUX8ugeGYyDWimNUfnxyhhGDZ+/McA=; fh=Gx9DtyNvQGBGx72Z12no3KggLYwBGD0Je53Cblw8uQs=; b=C7K/TF+PAVWtJOQipalnMlo+d4MYdkqPHdzYc6BrBpEepIDambVOmlfSLmYGmMKgSn 2kZ+nIhQ9qr1O0ihaL1ShlamyVGa044T/8yAZG0GAoGyakm/i8HM8jAR9qg6Ju2QkJIw KBzrZdAAhGT681bsORzw7JOxQWsPplZabC6VpoMw5e1xN8siEPP/v4cQJhmuiEo8ZuHH xdtIjVB4WTmC+EO7t50VqY+UxfEo+8kax3H5YsAJTvXCpaodWMqwK6K+B43liAejbE6P SfADgAhLvS0bO06FdTfOBt2KQs/jmozuUnVWCjlsN+wTD8em0BRW+m7QlxXecL69EyE8 9jFg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aCCEjJxb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6c53478299fsi95010576d6.355.2024.09.10.23.48.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2024 23:48:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aCCEjJxb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soH7v-0000Ws-Gr; Wed, 11 Sep 2024 02:46:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soH7s-0000Vg-Vk for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:53 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soH7q-0004P3-3R for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:52 -0400 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a8d60e23b33so388701766b.0 for ; Tue, 10 Sep 2024 23:46:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726037208; x=1726642008; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/8ZryqeSlz/ExYUX8ugeGYyDWimNUfnxyhhGDZ+/McA=; b=aCCEjJxbIHb6G/jYQQfnSzSKIg2HziMbMVX1b3HZpy2DeEDGmT8YMCF8HUHhmUXPjQ QCLFxWaxH5k7W8H3qWPkJpoe36/CuAOA5EpFZw4y16M70U/roBZNFiX16ax9kB/++seW yIyHfg3PcPr271vXrKiWSh9/S7/FKg+Ih096LXCQRUH+LZm6yH/mh47bGurmTNHY48Hd dPXOFVeW4J6pCm7HR1v/Y1pEgnPOp7zxzKDa5cGr5DobZE/IPL+MGqc3kgc8VVB2p1JH h+J8WxFGmZnWIRAJXV5svE5iY100JpV2jMMmgeLxS9KwqXG7oIUAAhXLZD+iLfFbEA1/ 9DpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726037208; x=1726642008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/8ZryqeSlz/ExYUX8ugeGYyDWimNUfnxyhhGDZ+/McA=; b=PCC6h/aYBUXaqULvg750cGCqRm4qmc1NwADLeAhotE2lyN4kgbY5tXm49vTAsLIsJv 7wq3E/xf1HJJpJEv5p3t3D4fcglz52R7st7UIj/FQJZ2+a/Jd+03fELQKbLPPjKNWuqR tz5VBLHtT0MNAXmQ9Ra0wYfjoTC/4UXEC8jCXc5lyzTDkUlS7+nfkyZbllw576fo3Tcl vG1VOhfw5Bex3art87WdqOcb5UqeB2T31r9uWMT+zvaCan8OX3sO5CRZsHDVREq1Eyqg Jdr3iCAIcHdujE0K4ZC+3gGASM37rlsBzkgIepPCaACPOPe1iKcf/eTVkIS64TcosCa9 Hq+Q== X-Gm-Message-State: AOJu0YwXEFJ8q75h7460Im7CQk4VZUY6BFd3Z7J4VvznJQ4Brj55vvTp wfyy15AE1wyCxo0FtYaeoTJiRO7keuaKAvQqqH4WtZGHUFOKXi5y8yFsnfGouAo= X-Received: by 2002:a17:907:7245:b0:a8a:926a:d02a with SMTP id a640c23a62f3a-a8ffadc78d1mr276012166b.49.1726037207804; Tue, 10 Sep 2024 23:46:47 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25c62541sm580541466b.111.2024.09.10.23.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 23:46:47 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6AA245FA08; Wed, 11 Sep 2024 07:46:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PULL 04/10] docs/devel: fix duplicate line Date: Wed, 11 Sep 2024 07:46:39 +0100 Message-Id: <20240911064645.357592-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911064645.357592-1-alex.bennee@linaro.org> References: <20240911064645.357592-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org I guess the same change came in via two patch series. Remove the repetition. Fixes: 2a851fca9f (docs/devel: remind developers to run CI container pipeline when updating images) Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Bennée Message-Id: <20240910173900.4154726-5-alex.bennee@linaro.org> diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst index e9921a4b10..09725e8ea9 100644 --- a/docs/devel/testing/main.rst +++ b/docs/devel/testing/main.rst @@ -500,12 +500,6 @@ first to contribute the mapping to the ``libvirt-ci`` project: `CI `__ documentation page on how to trigger gitlab CI pipelines on your change. - * Please also trigger gitlab container generation pipelines on your change - for as many OS distros as practical to make sure that there are no - obvious breakages when adding the new pre-requisite. Please see - `CI `__ documentation - page on how to trigger gitlab CI pipelines on your change. - For enterprise distros that default to old, end-of-life versions of the Python runtime, QEMU uses a separate set of mappings that work with more recent versions. These can be found in ``tests/lcitool/mappings.yml``. From patchwork Wed Sep 11 06:46:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 827363 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp657418wrc; Tue, 10 Sep 2024 23:48:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUBjKqNnvnJePRmmTzpX+8migroHz1V5piNAdmsqExUhFWUKKsEMyarkgY1A8YB9hnDuR+R+Q==@linaro.org X-Google-Smtp-Source: AGHT+IE1lXVnByomnl9Pd7iefRfpiBn5iUFgHEzfU/i0GoRj68e7t1cmZn/Z59b0CVyPdhARSkS1 X-Received: by 2002:a05:620a:2449:b0:7a9:aba6:d012 with SMTP id af79cd13be357-7a9aba6d431mr1721712585a.22.1726037324055; Tue, 10 Sep 2024 23:48:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726037324; cv=none; d=google.com; s=arc-20240605; b=kRvK79BNwDmqW4qfcKanor/aJgWZwZcq9gKXHcG1QayNaIJ0xQ/dPPUaxOWfy1kuQF D5KSCsQAC2+JTf/qFAc7jk7hvANDO+uS1zm1mVhl8YQ59xcPj+nNqsQq+Q0IXAmocbEj 7C548VPCuWQo3epQ99IS7+/RTOcdvyjOU7GT/rg7PPSOejLYZuFDWAKlUVlPh2pear2E H5C4tNi+trKiCF/EGbM4D/Rem5UWXMcZE2AkydcvZeOobD5BVF1G6T2eiEes/pkNmsUI E2TmXigLnV06kpYzNQxl17LBD+Li3EGYZPkBRh+qMfUvzTUn3Bttci0WdHc6+AepKP3b nVbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FrvaAWuF5v0aOpUmK/2t60ZFaqLxvEHy+/W3U6nvVig=; fh=+k0tS9PoAeXIWl6E54cI11Z4akDF1oca09oqG468MiA=; b=c2biDIKru4OiZ8HZRZuvsbQvJUB2d1zMJmyg+TlpY6whRd4TnTLVxf6xrXSREvgLTZ 5N7eWYfLhdX3KMZ6jWOX1Eg1A0BZmgfVKRKwvZT/0dfzReIpbJzHLj6y/3jyTDOObxed TylpcNu+jJDHhgGR7IojARpIxlEu1PkbcjMqBBQBhWhgNhh8Zj6o0zyWUjyuwtn19cay mfwOHzqhgE/PKKaQV4ss7iIM0WXOpPvkvBoXTMPuFzP1FX1kb7D8uznRiQmyNd4RXkGQ TcQACqEh8tUBYdqe8t+TN0HGxDUTVenbHEjPxuH+uhc7XhXX0TqzcQAtZvB0yKegrgga 1K5w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="OaPdf/ja"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a9a79f046asi947697685a.219.2024.09.10.23.48.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2024 23:48:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="OaPdf/ja"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soH7x-0000dq-7q; Wed, 11 Sep 2024 02:46:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soH7v-0000YO-P7 for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:55 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soH7s-0004Pa-Kr for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:55 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a8a6d1766a7so195148966b.3 for ; Tue, 10 Sep 2024 23:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726037211; x=1726642011; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FrvaAWuF5v0aOpUmK/2t60ZFaqLxvEHy+/W3U6nvVig=; b=OaPdf/jaOMfpBc0FPBwpZksFFTXAkca4U6xVZcoeMexnrE4H+yUIoAORtuOelWqFvw fx550NHLepfQUL+zwCtiREpS8rBrwHwvww7jf52ufpEFRizjur1xbYp/3zLkXrfAfuwb HmIr31/X2efZUB0Pr8i3sUi9sRDsIXs+2Ade0+8DfqNAdiMnepnqUT9+d4a9KNaTPoev CugY4TEPcZie+cVYLtuQfN9vjyr6XWm2/Yeh/3UJxG+II9Prx+ZUaBZui0OQhNzBGFnr xdKr1/idBOZ8AEDiu/ZdP7+/QsYlsINT/wCDB1Ej76RT0scXtHn4pdEBs6pJPDx34j70 OLig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726037211; x=1726642011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FrvaAWuF5v0aOpUmK/2t60ZFaqLxvEHy+/W3U6nvVig=; b=DP0R1qtazcp5Uvcsap0QWxGx95YofztxinOoED2zoivVEQCZhJ4FgMWUHcst+70E9W PgMgbXQy48r2WPRucBGelIXJTFd2j+MsXGMuWHUGmmxrRfLX/WssK1wf6r326wT5upzD gqRK2i8YnQz09I+HK0C5QvK169kqoiRImbTgRWfZFDIXsVxeNL5ysm/ONKnSHNgmiUWZ 2CslIleR0m6r0TAOUByUJGotIlWKyJ3xqaQNDAFuWlFyJUhkgqYjhZ9NZ9Sfpk+XxJl3 unF0kBN7WpW/Y9o+p/LzIHvigJIyMHR6Bv/9GiiDCT8EtX2KvrpdGFkvXh9Ghv6qLORB gkxA== X-Gm-Message-State: AOJu0Yx/8Id6R5Q0EtGHoFUN7LVKihHisk84D9iRnPmNavvYe57cJ5Yz tT/qeL3NjnXWSOicIjvlEzuRGTdisTdOIs+ogZrltJdshno3Z58gDqTjDGc+eE0= X-Received: by 2002:a17:907:86a1:b0:a8a:83e9:43e2 with SMTP id a640c23a62f3a-a90047457e7mr183129466b.12.1726037210948; Tue, 10 Sep 2024 23:46:50 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9012fa463csm19801366b.139.2024.09.10.23.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 23:46:48 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 802E05FA0E; Wed, 11 Sep 2024 07:46:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 05/10] scripts/ci: update the gitlab-runner playbook Date: Wed, 11 Sep 2024 07:46:40 +0100 Message-Id: <20240911064645.357592-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911064645.357592-1-alex.bennee@linaro.org> References: <20240911064645.357592-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The upstream install instructions: https://docs.gitlab.com/runner/install/linux-repository.html Now refer to repositories and a setup script. Modernise the playbook to use the preferred delivery method. Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Bennée Message-Id: <20240910173900.4154726-6-alex.bennee@linaro.org> diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml index 7bdafab511..57e7faebf1 100644 --- a/scripts/ci/setup/gitlab-runner.yml +++ b/scripts/ci/setup/gitlab-runner.yml @@ -49,30 +49,51 @@ - debug: msg: gitlab-runner arch is {{ gitlab_runner_arch }} - - name: Download the matching gitlab-runner (DEB) + # Debian/Ubuntu setup + - name: Get gitlab-runner repo setup script (DEB) get_url: dest: "/root/" - url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/gitlab-runner_{{ gitlab_runner_arch }}.deb" + url: "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" + mode: 0755 when: - ansible_facts['distribution'] == 'Ubuntu' - - name: Download the matching gitlab-runner (RPM) + - name: Run gitlab-runner repo setup script (DEB) + shell: "/root/script.deb.sh" + when: + - ansible_facts['distribution'] == 'Ubuntu' + + - name: Install gitlab-runner (DEB) + ansible.builtin.apt: + name: gitlab-runner + update_cache: yes + state: present + when: + - ansible_facts['distribution'] == 'Ubuntu' + + # RPM setup + - name: Get gitlab-runner repo setup script (RPM) get_url: dest: "/root/" - url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/rpm/gitlab-runner_{{ gitlab_runner_arch }}.rpm" + url: "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.rpm.sh" + mode: 0755 when: - ansible_facts['distribution'] == 'CentOS' - - name: Install gitlab-runner via package manager (DEB) - apt: deb="/root/gitlab-runner_{{ gitlab_runner_arch }}.deb" + - name: Run gitlab-runner repo setup script (RPM) + shell: "/root/script.rpm.sh" when: - - ansible_facts['distribution'] == 'Ubuntu' + - ansible_facts['distribution'] == 'CentOS' - - name: Install gitlab-runner via package manager (RPM) - yum: name="/root/gitlab-runner_{{ gitlab_runner_arch }}.rpm" + - name: Install gitlab-runner (RPM) + yum: + name: gitlab-runner + update_cache: yes + state: present when: - ansible_facts['distribution'] == 'CentOS' + # Register Runners - name: Register the gitlab-runner command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" From patchwork Wed Sep 11 06:46:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 827361 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp657384wrc; Tue, 10 Sep 2024 23:48:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVQAY1ht8SynAmkZfuM0X5JYd2vxvf6iLHIIsR0niDU9T1FVS6FRv00ZSedECpRhfyRxNM/xw==@linaro.org X-Google-Smtp-Source: AGHT+IHZrNt6KitTijc1h+Huxm2oDCCDPrUGaksIon0wp5VX5b+6yKj8a8yYvmVsJUsbLQd+Yvkt X-Received: by 2002:a05:622a:7292:b0:458:1de8:4e46 with SMTP id d75a77b69052e-4581de851a5mr193499161cf.6.1726037316191; Tue, 10 Sep 2024 23:48:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726037316; cv=none; d=google.com; s=arc-20240605; b=P/If0cnCh8w9rK8x8qliK5zs4aZ9djF8CFoVX9+DkgBMjuu7fs8QyX4WjC6i1mvKtb dRHNAA6gqwKFYZjDjLC86rEe122p0lA4n0ceQYxr6kUKGU+Mw7jequzSWiq63HSbrQsv WqUMQ7lYxqfEZ1wToNbYmnbxwLwQgOwZ/VpcRtggD5iUxCI2MSEfNtUt7bASeSFmIJO7 qyQN1noDtpM6UcZmclohsFAcvcRlBGa/IobdENpW9hHnNmhLzLTCXXArkW2QLSPSq6He I+Z4OVRo7Gu1+UjvekiZcQMl6JR/xAD/tBqFaFs4OPNuiEMmIYaWNZ6QblXmO+wNfRHX iYGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tWtyuSRUTsWzQ32wwrFhhMFhvMFudHu/cgYl3t03m1M=; fh=xfU5kIjl2Hy9XQk8eUJ3Oo21BVV/QvNpVcSCGpm7R7s=; b=SoYV4Rx4hdEInuNuIbCQP32tdP7IRi5VLlebfs4p0SY4kL8lryMiBc8ukfWgmLrRLT aD6N1alns1UC0q+QWzXT1iPZR/sAJc7V8Fsnqfd6Wb0Xsv/+I9lUS2NxOqVdkgblMohb mYwYCkfF7oNANZet1cR2jM/SYx/AAqLBujiBP9Ro1t61G+uIDPWWmjlyinMCC/haoHF+ pW4AVuxP+0yCVxrekp5AhdwlV7CIiqev19U3suCYOyZ6HIf+I2wP7592xGmtoIFgN7+W 6/Yy4E1nBqx0Kw5f0njqEtI8ZdOFxBPFwlcTOCAgB36SJqWece3GYLjd28GxuyJkE5mb wzrw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FBkP61zr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-45822fb14basi91055711cf.611.2024.09.10.23.48.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2024 23:48:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FBkP61zr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soH83-000123-27; Wed, 11 Sep 2024 02:47:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soH81-0000uZ-9c for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:47:01 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soH7x-0004Qb-DY for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:47:00 -0400 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a8d0d82e76aso94481266b.3 for ; Tue, 10 Sep 2024 23:46:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726037214; x=1726642014; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tWtyuSRUTsWzQ32wwrFhhMFhvMFudHu/cgYl3t03m1M=; b=FBkP61zrISEZPwIkiKP0CVqf4U45kPlAbU/poCcOX2UAeib5dxuRyjXubitD9cdGzL tasz5WcOkbGsIa2hukZZhGFsBP55mRa4Vb+lCB1shv3EGfOJZIMp5ctpAuFMppOz3fzw aXxAmNDEV/yLWG1O7ciq8IEw4oM8U9sTuV81s3dUky/WSML9fSyRhw6ysVEQgL6EmENa caM/8yLD+pZZgGacUq2lol6TMOwMPmtKhIhiICGdNTX7994zYJHhilSYHWXpX1NOZu7z 56QID2mNtGy/kXn2e/pIgZXXBA9k/hh5aXCcdyCvjlZ55vFC7lFbwyrrsTGUZ23k6hxL Azyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726037214; x=1726642014; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tWtyuSRUTsWzQ32wwrFhhMFhvMFudHu/cgYl3t03m1M=; b=WJTCfFPCqMES305+arovjUIOMW10eQdUIAyYN4nJxNJyBRjo/kmkySx9RhmeMPImRt E7I7qEuL9grRW1N0Ss25D4acOssn3sujHmvx2FRMXsDmDkX3p27B1LgVWGJLR/AFS2A0 91HiisDLZYJsOIEzNsEcpSYauhDDZE3ySkDI61/mjhe5qWNV76m/yzuYcYK8bCcV2oCC w/MQf7RYp7cPuSL0qtTc/IagdjvuOmdbHLmZMiMIrC8aDi0jeys4ycDA65zvcSD0g25b 1O50E9jFag/WeocS71us0YEBLCPdCYrWzwgukUFNiu0M96uVZixWbHy0fHoc91I8uIS9 j9JA== X-Gm-Message-State: AOJu0YzCDx7FvolB2UUean5pJxd6jyW0w3InIAH7QeC6vJbjMjTxQzbs XSVsSHP9hIDtMQjqnDewZZc22YFTynVB2Lh7qAhPlYwFcC32/5Sue/KP3mOiQpc= X-Received: by 2002:a17:906:d550:b0:a80:d913:be07 with SMTP id a640c23a62f3a-a8ffab88f5fmr326396666b.36.1726037214068; Tue, 10 Sep 2024 23:46:54 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd8d9d2sm5118539a12.90.2024.09.10.23.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 23:46:51 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 961D45FA11; Wed, 11 Sep 2024 07:46:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gustavo Romero , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PULL 06/10] gdbstub: Use specific MMU index when probing MTE addresses Date: Wed, 11 Sep 2024 07:46:41 +0100 Message-Id: <20240911064645.357592-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911064645.357592-1-alex.bennee@linaro.org> References: <20240911064645.357592-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Gustavo Romero Use cpu_mmu_index() to determine the specific translation regime (MMU index) before probing addresses using allocation_tag_mem_probe(). Currently, the MMU index is hardcoded to 0 and only works for user mode. By obtaining the specific MMU index according to the translation regime, future use of the stubs relying on allocation_tag_mem_probe in other regimes will be possible, like in EL1. This commit also changes the ptr_size value passed to allocation_tag_mem_probe() from 8 to 1. The ptr_size parameter actually represents the number of bytes in the memory access (which can be as small as 1 byte), rather than the number of bits used in the address space pointed to by ptr. Signed-off-by: Gustavo Romero Reviewed-by: Richard Henderson Message-Id: <20240906143316.657436-2-gustavo.romero@linaro.org> Signed-off-by: Alex Bennée Message-Id: <20240910173900.4154726-7-alex.bennee@linaro.org> diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c index 5221381cc8..85a19c14c7 100644 --- a/target/arm/gdbstub64.c +++ b/target/arm/gdbstub64.c @@ -435,6 +435,7 @@ static void handle_q_memtag(GArray *params, void *user_ctx) { ARMCPU *cpu = ARM_CPU(user_ctx); CPUARMState *env = &cpu->env; + uint32_t mmu_index; uint64_t addr = gdb_get_cmd_param(params, 0)->val_ull; uint64_t len = gdb_get_cmd_param(params, 1)->val_ul; @@ -458,8 +459,10 @@ static void handle_q_memtag(GArray *params, void *user_ctx) gdb_put_packet("E03"); } + /* Find out the current translation regime for probe. */ + mmu_index = cpu_mmu_index(env_cpu(env), false); /* Note that tags are packed here (2 tags packed in one byte). */ - tags = allocation_tag_mem_probe(env, 0, addr, MMU_DATA_LOAD, 8 /* 64-bit */, + tags = allocation_tag_mem_probe(env, mmu_index, addr, MMU_DATA_LOAD, 1, MMU_DATA_LOAD, true, 0); if (!tags) { /* Address is not in a tagged region. */ @@ -478,13 +481,16 @@ static void handle_q_isaddresstagged(GArray *params, void *user_ctx) { ARMCPU *cpu = ARM_CPU(user_ctx); CPUARMState *env = &cpu->env; + uint32_t mmu_index; uint64_t addr = gdb_get_cmd_param(params, 0)->val_ull; uint8_t *tags; const char *reply; - tags = allocation_tag_mem_probe(env, 0, addr, MMU_DATA_LOAD, 8 /* 64-bit */, + /* Find out the current translation regime for probe. */ + mmu_index = cpu_mmu_index(env_cpu(env), false); + tags = allocation_tag_mem_probe(env, mmu_index, addr, MMU_DATA_LOAD, 1, MMU_DATA_LOAD, true, 0); reply = tags ? "01" : "00"; @@ -495,6 +501,7 @@ static void handle_Q_memtag(GArray *params, void *user_ctx) { ARMCPU *cpu = ARM_CPU(user_ctx); CPUARMState *env = &cpu->env; + uint32_t mmu_index; uint64_t start_addr = gdb_get_cmd_param(params, 0)->val_ull; uint64_t len = gdb_get_cmd_param(params, 1)->val_ul; @@ -527,8 +534,10 @@ static void handle_Q_memtag(GArray *params, void *user_ctx) * Get all tags in the page starting from the tag of the start address. * Note that there are two tags packed into a single byte here. */ - tags = allocation_tag_mem_probe(env, 0, start_addr, MMU_DATA_STORE, - 8 /* 64-bit */, MMU_DATA_STORE, true, 0); + /* Find out the current translation regime for probe. */ + mmu_index = cpu_mmu_index(env_cpu(env), false); + tags = allocation_tag_mem_probe(env, mmu_index, start_addr, MMU_DATA_STORE, + 1, MMU_DATA_STORE, true, 0); if (!tags) { /* Address is not in a tagged region. */ gdb_put_packet("E04"); From patchwork Wed Sep 11 06:46:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 827359 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp657339wrc; Tue, 10 Sep 2024 23:48:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW0wm5QcJQvX4eqb7LX5ndiRfhenN7kHIyvERweYaGoT0oT1Z0e2hjzA+eKmWP46xTs0VYHiQ==@linaro.org X-Google-Smtp-Source: AGHT+IEtFqpXwBdMIYOAkzCwROfi2D3YkZSrzA7+ooGGUX/7r0uC98oI876edXYKyBfxWtkInHMs X-Received: by 2002:a05:622a:34c:b0:446:560e:ca08 with SMTP id d75a77b69052e-4584e8ff9a4mr38531671cf.27.1726037305812; Tue, 10 Sep 2024 23:48:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726037305; cv=none; d=google.com; s=arc-20240605; b=YkY97/uSYS+fQh2ozdbSE9bagT5YUKlzNt4RZTp4tisqskH8QcXIbPVk/YutsKuGec No90b7qEsZ1LdU7AO+gn0ccUhTPsAe54w1R4itOZV8VI0PriFxTEQqPTdtx0KQZzmgf8 MZtgDKxzeJZ5Sb2JlkBB3oIkNyYVZm4HXuyCHDAHNwSsJ+Q3iQQtB1jJa44hWZl/B93L BKGve8+REOtnPgkd2lpwsqLSq7N49X/ej8KA11ArG5yd3fs+3LRe5DnmBVSyodk1EKHB /bIxO6s+jNAyp4Xt7NrGbLrMRFdn8wMK+EdGWRpFgH6UeeZgpMK4IA4piC8gP+Y6ttXe N0mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tLs1gUYVWKM0j1iUsQtfNi5LsHTLadgSNPZsoYPZNTA=; fh=xfU5kIjl2Hy9XQk8eUJ3Oo21BVV/QvNpVcSCGpm7R7s=; b=MRyG3pMpYuZ64KOAzhJIsr46xmdla6MWjf7EtFilZ5QX03jlEhhYX45V8ta54cRO2o OhBhliEdknCIxjn8HhYjLvRL6AevRxkVqPT9Vwevd0GKe1XK3qzPU+3vLXF8HAq31Osw tTFS7tVg3UBdXNZGYsQGth8ZaeON4/lRSWZ1LTD+47HZJIPNahGwjihFSNv9/88j8vKp MNnVT2LjJRT2DM1Bt4sF9QIF3uSCWWi65hiFXBpTdpN4b4HCm3hGAUcrku0LiBGSdPqh RbC64QzpUOOwsDEwU/1nhd/sJ7VkazTjCY9pBYvC9/j1m6FilevwW6VpiLIuccL+NK8C By7A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="a/Nknb+I"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-45822e61391si92256231cf.114.2024.09.10.23.48.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2024 23:48:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="a/Nknb+I"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soH82-0000yj-9M; Wed, 11 Sep 2024 02:47:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soH7x-0000fu-NL for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:57 -0400 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soH7t-0004Pg-9q for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:55 -0400 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-5356bb5522bso8260637e87.1 for ; Tue, 10 Sep 2024 23:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726037211; x=1726642011; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tLs1gUYVWKM0j1iUsQtfNi5LsHTLadgSNPZsoYPZNTA=; b=a/Nknb+IeLAmAFOo/n22X70SuopQJlAThz8MfrM6cLCQo0IbOFXvoxhy5BgXsfDWBy pDxzZsA8Mf511R3ZauMA1t6oa0dIP6eOc1TNCpMn8amrjqG9VJXLO274lIcfzpBNlTU1 CT3zuz+Wc0jXpdWjrjslPUefVdQS6q81Rwean102gK0cvEPbrQNd5LO2igaB3XxW7crO p2sPpqUKAfE+3AR9TQnS/JFZwJLyRMIrc7Qz8vjgXNAY2AAfsT4mCLbXOkwMuM0gna3r xTt1vabkDHBVfPBmEPuxfKfOrAPU73SRxJnCBP6Fv8P5QOfdPEP1R3Klsb/BNFD5b2qN 1Ytg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726037211; x=1726642011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tLs1gUYVWKM0j1iUsQtfNi5LsHTLadgSNPZsoYPZNTA=; b=feUW9qWepvEbNFfaSBe5NVDTQhcdhSpKvvdWVOA5myC7Vcv24cmUWHGFhRq/qvC5cR /7p1Anqp2lTr+jmr7tLwrhrnRzOIKqBQm9nyAe2cuKxd2zje2qWrK9+xVLYIJdVlVesT 5XwRF71X+/tjvTwi+ndLdL/E3edxUSxPCIjs3uL3bar3IgENW8HiSdN1wdnHFW8j8ZJZ 0T161D0/R6OUEEo5vTGlPZ1RslQ7PhdCO0L3LIDHqUz7jpDRo8Y+q1uf7qaEBYbm5gNU 4g2fnxGErRuVgZb2C8LoDWeyssK8+N3i4M1wzsyNj774ULUUV7ADQ/EM3w9X7c8C0CMy L2BA== X-Gm-Message-State: AOJu0Yzd/7G8XBXUjiWrByTijKNwu1IzjRpPlj/P9/9J8JvlpZPST9m/ VPs/c0duYaXtsoy0vPAUPOC4XhopfT3ojpcNJs4MPcM1GNJ6k8vK9H3rkUtOJYk= X-Received: by 2002:a05:6512:b03:b0:535:82eb:21d1 with SMTP id 2adb3069b0e04-53658814414mr11023859e87.57.1726037211300; Tue, 10 Sep 2024 23:46:51 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd46824sm5059241a12.23.2024.09.10.23.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 23:46:48 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id ABBF85FA14; Wed, 11 Sep 2024 07:46:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gustavo Romero , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PULL 07/10] gdbstub: Add support for MTE in system mode Date: Wed, 11 Sep 2024 07:46:42 +0100 Message-Id: <20240911064645.357592-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911064645.357592-1-alex.bennee@linaro.org> References: <20240911064645.357592-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::130; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x130.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Gustavo Romero This commit makes handle_q_memtag, handle_q_isaddresstagged, and handle_Q_memtag stubs build for system mode, allowing all GDB 'memory-tag' subcommands to work with QEMU gdbstub on aarch64 system mode. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/620 Signed-off-by: Gustavo Romero Reviewed-by: Richard Henderson Message-Id: <20240906143316.657436-3-gustavo.romero@linaro.org> [AJB: add #ifdef CONFIG_TCG guards] Signed-off-by: Alex Bennée Message-Id: <20240910173900.4154726-8-alex.bennee@linaro.org> diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c index 85a19c14c7..1a4dbec567 100644 --- a/target/arm/gdbstub64.c +++ b/target/arm/gdbstub64.c @@ -430,7 +430,9 @@ int aarch64_gdb_set_tag_ctl_reg(CPUState *cs, uint8_t *buf, int reg) return 0; #endif } +#endif /* CONFIG_USER_ONLY */ +#ifdef CONFIG_TCG static void handle_q_memtag(GArray *params, void *user_ctx) { ARMCPU *cpu = ARM_CPU(user_ctx); @@ -600,13 +602,13 @@ static const GdbCmdParseEntry cmd_handler_table[NUM_CMDS] = { .need_cpu_context = true }, }; -#endif /* CONFIG_USER_ONLY */ +#endif /* CONFIG_TCG */ void aarch64_cpu_register_gdb_commands(ARMCPU *cpu, GString *qsupported, GPtrArray *qtable, GPtrArray *stable) { -#ifdef CONFIG_USER_ONLY /* MTE */ +#ifdef CONFIG_TCG if (cpu_isar_feature(aa64_mte, cpu)) { g_string_append(qsupported, ";memory-tagging+"); From patchwork Wed Sep 11 06:46:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 827358 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp657303wrc; Tue, 10 Sep 2024 23:48:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVEP0pMO7rruYvT+H388AZi4LYTwJ38hVaFgvJXYn0XWKv9YA0NvBkrBtWXgvr/ke9cGRG9wQ==@linaro.org X-Google-Smtp-Source: AGHT+IH3nsCsL91NwFBr2DCJA42BxBQJe1a++F1ppSO38i37UjoxV1XTJGglrcMFGJbWegCfcPpM X-Received: by 2002:ac8:5f8b:0:b0:44f:f118:d875 with SMTP id d75a77b69052e-4584e92536bmr32024611cf.36.1726037297209; Tue, 10 Sep 2024 23:48:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726037297; cv=none; d=google.com; s=arc-20240605; b=JytGrN4RIOQT1QXeva3uvjvpMDEKlZv7MMsxDklB/YOMEX2q/B6DU1/2+qjWKkqdnU jL+/iWLMwp+wWk5N3cYCuUqjLsXOT/vG0ybaLLixual1+CcPHvlTPR8N5PgVCizCEqV1 36XSGL9vQcou5FUr+naXI7rKUx88lxyRu4aTz+5OHUxLl0b7lbAkEVGqs188rJ/cClwY F+i0V+5fSeCwI17q/QpbqZ92Lr8wGoNC7PewGj3fdoJrGQRn6z3gzgYIvn+HWm3EeyCm sQMSl364YtGccC+YQnty5sBM9gTag6m2ciaJtaMmr9DHNgJSnGLm8HwciA+flw+NnikQ dqkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gzjhDYaJi6Bnx+rLU77Ms8m0/GdXNL2aorzkrS+8+qs=; fh=oS3g6+xHBBmjHOUc1b0A8TeelnMjnJltA+GbZRI/YAM=; b=DFKsQGiZs7ETgNNoPIXuycsoboz2QqEgveaqlSTZLpG0xVyYW9DvrBVtTpGIc1Cieq BM88UNRw/5I1/LmIKe8Vk5PLfAwKFW3jdzCZW4QHCMlx0cv2LTcjT8hMstZmGmn1r9HO 2OMMpsqNL5c4e7wuUEDS4+XtDf+lbz7HnDViW0fE/yW+RTTgnjJRmfR/tv9TzMmS3Fvn pLpgHTiA4TuJzFXbLN/qeSyvzjbtu3inT9oV5QmkNxBaSmBomnnFKrzY3NSTi5ZgOWrf 7bKHyM/3voTUMcPF9/DiJkX6oNnUT7blxwOzVVuiqp6AKSjcrkQbFAHjRfyKSKaOqynQ aTxw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ggWc88S4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-45822f8116esi94574121cf.491.2024.09.10.23.48.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2024 23:48:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ggWc88S4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soH80-0000rf-KA; Wed, 11 Sep 2024 02:47:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soH7x-0000fq-NA for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:57 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soH7t-0004Pq-Cu for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:56 -0400 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-5c275491c61so7935239a12.0 for ; Tue, 10 Sep 2024 23:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726037212; x=1726642012; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gzjhDYaJi6Bnx+rLU77Ms8m0/GdXNL2aorzkrS+8+qs=; b=ggWc88S4TLgPMssw31kRcBbi7/yzQvlSEEVGHMv+qL9TB8jyxDwbVQtmQUPwExvjwi h/Zhcyd2fJnSftkEpH6aFUdlCRofcLP311RsvA/cSK/VQjBCfIDLpBch4FY+xPTc0T15 zXDlK5affWYyEr6n0F3s5WIdo5IrhZJxbVj1BT/40dOPITrmnFBt21ceCGixzzG2Shld AGeg0XM3kbu6tngNl0TRFoA62mFPqCxR9y6TfXIVudAeKM09etAMiS0NN+Y5FfgZqRaQ uDhF6q2lkZ7yq3Y1jNe1fgGp2Sj2lyvvahqhdsuYZcpUIg9xgBpCPa+8oj+stiuhujMi IiRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726037212; x=1726642012; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gzjhDYaJi6Bnx+rLU77Ms8m0/GdXNL2aorzkrS+8+qs=; b=Jhk1EpiqF3KJUfDqZDUiNQSEX1lCexL4ohHdFT5tuujWFgxNEunW3NesOijWJlgYNz 5lnE+/evm13CHlK+fpe3EjSX1YRdRDaBuN8D7TDJ8yuLCy8OyCQUTOBd/cuJ1ExWE6Xx kqa0g4LNklsOq+l13MBpeWZJqAzluI6xj78aeINTayJIqptZQE8AOzsNZiiDq80ynIjp V0Ohmk0XGVDNbLy0F4rAGdavFGG/psMR40Ig+eFzwPktq/3GKdyB/aLzWI3dwsUS0FWx 3HfHk3xpBDisVtYYMe2X20WxBt/+9mGfSGBRs24IM6VTe46FQ6SjJavppVHrTifqXgSo UUSA== X-Gm-Message-State: AOJu0Yx1ZRqER7bi0nHRTMqGyvSvv0L9C92UlfvfKIf1g+s6btPvVLYw GzJjwldYE9i0tYHp9DAb55Xhq1LF8XQaP5P9l4KU3ijTPp2jQJOG/fnLUumkIlA= X-Received: by 2002:a05:6402:4312:b0:5c2:5c77:3321 with SMTP id 4fb4d7f45d1cf-5c3e9533529mr14238861a12.3.1726037211614; Tue, 10 Sep 2024 23:46:51 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd8adaasm5350300a12.80.2024.09.10.23.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 23:46:48 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C39665FA18; Wed, 11 Sep 2024 07:46:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gustavo Romero , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 08/10] tests/guest-debug: Support passing arguments to the GDB test script Date: Wed, 11 Sep 2024 07:46:43 +0100 Message-Id: <20240911064645.357592-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911064645.357592-1-alex.bennee@linaro.org> References: <20240911064645.357592-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Gustavo Romero This commit adds support for passing arguments to the GDB test scripts so it's possible to parse the args in an "argparse way" in the test scripts launched by the runner. The arguments should be preceded by -- when passed to the runner. For example, passing "--help" arg to the GDB_TEST_SCRIPT: run-test.py [...] --test -- --help The test script should not use the argparse module directly but import arg_parser from test_gdbstub module. arg_parser then can be used just like the argparse.ArgumentParser class: from test_gdbstub import arg_parser p = arg_parser(prog="test-mytest.py", description="My test.") p.add_argument("--vowel", help="Select vowel", required=True, choices=['a','e','i','o','u']) [...] The arg_parser allows a smooth and informative exit if, for instance, the caller of the runner script passes an invalid argument or misses a required argument by the test script. Signed-off-by: Gustavo Romero Reviewed-by: Alex Bennée Message-Id: <20240906143316.657436-4-gustavo.romero@linaro.org> Signed-off-by: Alex Bennée Message-Id: <20240910173900.4154726-9-alex.bennee@linaro.org> diff --git a/tests/guest-debug/run-test.py b/tests/guest-debug/run-test.py index 368ff8a890..5a091db8be 100755 --- a/tests/guest-debug/run-test.py +++ b/tests/guest-debug/run-test.py @@ -27,6 +27,10 @@ def get_args(): parser.add_argument("--binary", help="Binary to debug", required=True) parser.add_argument("--test", help="GDB test script") + parser.add_argument('test_args', nargs='*', + help="Additional args for GDB test script. " + "The args should be preceded by -- to avoid confusion " + "with flags for runner script") parser.add_argument("--gdb", help="The gdb binary to use", default=None) parser.add_argument("--gdb-args", help="Additional gdb arguments") @@ -91,6 +95,8 @@ def log(output, msg): gdb_cmd += " -ex 'target remote %s'" % (socket_name) # finally the test script itself if args.test: + if args.test_args: + gdb_cmd += f" -ex \"py sys.argv={args.test_args}\"" gdb_cmd += " -x %s" % (args.test) diff --git a/tests/guest-debug/test_gdbstub.py b/tests/guest-debug/test_gdbstub.py index 46fbf98f0c..a715c0e3f5 100644 --- a/tests/guest-debug/test_gdbstub.py +++ b/tests/guest-debug/test_gdbstub.py @@ -2,6 +2,7 @@ """ from __future__ import print_function +import argparse import gdb import os import sys @@ -9,6 +10,10 @@ fail_count = 0 +class arg_parser(argparse.ArgumentParser): + def exit(self, status=None, message=""): + print("Wrong GDB script test argument! " + message) + gdb.execute("exit 1") def report(cond, msg): """Report success/fail of a test""" From patchwork Wed Sep 11 06:46:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 827354 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp657235wrc; Tue, 10 Sep 2024 23:47:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU5KNt8v30nx0z18TXDw8z52MLQ7BK6zObuOAwTpRgKIUl/2kP35Zehozf4qfofrujmOlzzpw==@linaro.org X-Google-Smtp-Source: AGHT+IHmKsXnqZInOqLl2tUyM7N32KerjG2cTmLPE5uqhO1uR2NqwohyMmsb0z2nFuE5jRhmyGW8 X-Received: by 2002:a05:620a:4593:b0:7a8:e4f:1efc with SMTP id af79cd13be357-7a9d3a167e4mr333741185a.7.1726037278425; Tue, 10 Sep 2024 23:47:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726037278; cv=none; d=google.com; s=arc-20240605; b=K7xVpZ7kN5ebM4HolG1wyIW+fNndINaoKlHtcdtftORMlxmWcWvQcOZZLIuFTBhjaf E1Hqfh+YokCfh9lau1w5K5KjW4rsCFHTWYCAMyx/tXAUfM3PMhXoV1zzkZ/Da4o+z1c4 7zR+ft1866hOPk2iDpxhBCphYYvJ4Ghu2f2daiDMLBrxGC7Q+j+jg0O/65z0eJNAbUs3 3hR+4Kmq7c0Z4qDJKK3XMWWiB+yXf8bylS2DDlbOiGY0SFfUnEwP+vy9i7MS8NL+sL8k yao+gCgs7FP1k2vBYeqvsjXoovc6t694FcawLde231OgGbnzWCKgKe9JG0Xi+I0p/K4z GoOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vZtRldQU1q8wU6EHCfF9wA3KDcDHpctGTgp2Kf7weoU=; fh=xfU5kIjl2Hy9XQk8eUJ3Oo21BVV/QvNpVcSCGpm7R7s=; b=KLV1wZzlP5yHB04RDHvDqnwqtYIhopREyE9VC7hH2IXFj7CnpOFF3fNQGEM9YbNfAP YSk0zKQmqqMULpYjYv1hbGHKnEnRHXlLxPA82kFyNKM8e2b6ePaVRg2DzoADlQ1Ukmjm KzWetgpm4m7bYWCVydrLMDsApn0wJEbmIGR1iPQkN/jSIILQDtABYA7PD0fJ2bEkHbk2 BEAh9FZd5Tb/XuB9RkM25f1WRdLjhYdpUopMdgttJUyEnSdrcUA3sWQb0pkBuVCA34Y3 8R3/pxAeSkcXoM//WeHThP7bY4tMGy4Mjzvn+edAifZJfihGVlQlMNE6Tv+1heM5ICTC 4k2Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="xSPoO/tQ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a9a7a55edesi998886885a.580.2024.09.10.23.47.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2024 23:47:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="xSPoO/tQ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soH84-00018z-U7; Wed, 11 Sep 2024 02:47:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soH81-0000uh-AI for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:47:01 -0400 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soH7x-0004QX-Ga for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:47:00 -0400 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-5356aa9a0afso10839345e87.2 for ; Tue, 10 Sep 2024 23:46:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726037214; x=1726642014; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vZtRldQU1q8wU6EHCfF9wA3KDcDHpctGTgp2Kf7weoU=; b=xSPoO/tQID3jne5T7GE5MfM4ysFZc5fTIMBwfPaBgRXlrHEPWH4eXF/SPMsT1vroW/ bQ80/EUvQWUBdieGDC49tCV8Rjf3aQ+AtdPyPyDpzY3N13fyizBbBNCtqoDUlMSNCe0I Kc1E1F37/i4+O2dbd57w6rhaA2oz3E2YjBV+KDnZAcrPmEXVJhoLsEcXjtV9D2ZgR0Ad diPB3jiU1hCaJOMUZ+TrlLHpWDbYI9EsW5rGJ3zDOL6cDmuQnZYQs2jxJGmZFyjp46ES eCnbHyMo1nqTNYUJIIXHeqDa5r/THJuyge1J/pqlA5bsJ0vJz4feY6BSVh43fmPk9hWd XayQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726037214; x=1726642014; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vZtRldQU1q8wU6EHCfF9wA3KDcDHpctGTgp2Kf7weoU=; b=sstC51jHW/I9Pdrw7/QHK9QMy+IliEnG1NRWiOjN4Rn/5M847Z7yjlA0OSGs94duv4 QA3vSSU512L0tmUzGtCYk8vBL+wPp3NUteckMRV4jTD8ys7ZPJ2XSzJlYZi+xGek2wAp oT8ivqqB+0kzM2+2gK8V2wlESNb8YoiqvnQb9Qa2K9mkaDzriz0tMefOrJgXTmaQYvaW 3tpqixs28UQVhhadKt06ygIPUQI3BG4/LWazyuRcMWptVmcNUXYDfsgG4/WmlxoRZ5WH PjUsQldA2DSIr0kOOxvpnn7w+JLzHMaAa2tUryxwJwIOQRHg8zO8s8LR4p26wWsOWxkZ hScQ== X-Gm-Message-State: AOJu0YycDvx1BcoQypfR6V7N/l4ZbPF3CMVDY8I/AnI8fFaoaKEvAklm jFBI7HLERAgeYsYnvMADo7nVDV7rWPv5P+jfjl0y66xXZyivohkKaMZxjF7/EmMMavsmVBM1ssH nHfI= X-Received: by 2002:a05:6512:3d20:b0:52c:deb9:904b with SMTP id 2adb3069b0e04-536587f8770mr12981179e87.38.1726037213381; Tue, 10 Sep 2024 23:46:53 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d258354d1sm578640466b.13.2024.09.10.23.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 23:46:50 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id DC1115FA1C; Wed, 11 Sep 2024 07:46:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gustavo Romero , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PULL 09/10] tests/tcg/aarch64: Improve linker script organization Date: Wed, 11 Sep 2024 07:46:44 +0100 Message-Id: <20240911064645.357592-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911064645.357592-1-alex.bennee@linaro.org> References: <20240911064645.357592-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::133; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x133.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Gustavo Romero Improve kernel.ld linker script organization by using MEMORY command. Signed-off-by: Richard Henderson Signed-off-by: Gustavo Romero Message-Id: <20240906143316.657436-5-gustavo.romero@linaro.org> Signed-off-by: Alex Bennée Message-Id: <20240910173900.4154726-10-alex.bennee@linaro.org> diff --git a/tests/tcg/aarch64/system/kernel.ld b/tests/tcg/aarch64/system/kernel.ld index 7b3a76dcbf..5f39258d32 100644 --- a/tests/tcg/aarch64/system/kernel.ld +++ b/tests/tcg/aarch64/system/kernel.ld @@ -1,23 +1,23 @@ ENTRY(__start) -SECTIONS -{ - /* virt machine, RAM starts at 1gb */ - . = (1 << 30); +MEMORY { + /* On virt machine RAM starts at 1 GiB. */ + + /* Align text and rodata to the 1st 2 MiB chunk. */ + TXT (rx) : ORIGIN = 1 << 30, LENGTH = 2M + /* Align r/w data to the 2nd 2 MiB chunk. */ + DAT (rw) : ORIGIN = (1 << 30) + 2M, LENGTH = 2M +} + +SECTIONS { .text : { *(.text) - } - .rodata : { *(.rodata) - } - /* align r/w section to next 2mb */ - . = ALIGN(1 << 21); + } >TXT .data : { *(.data) - } - .bss : { *(.bss) - } + } >DAT /DISCARD/ : { *(.ARM.attributes) } From patchwork Wed Sep 11 06:46:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 827357 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp657266wrc; Tue, 10 Sep 2024 23:48:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXtRh2l8U0Ynt3ja4M8LWRyWA+D+w0vRF1Ms0jpz6U2BD4XLUZKKpg1KPo4Sj/rCYXpbXYAow==@linaro.org X-Google-Smtp-Source: AGHT+IF1ZKPgUs+aneal8IFvSIkI9B7LGu82BbZnv2VVqHxqawvFQHWXPQemylaMPFqXDTfACMhJ X-Received: by 2002:a05:6214:5991:b0:6bf:7bcd:78e3 with SMTP id 6a1803df08f44-6c5284f5c50mr232633536d6.29.1726037289831; Tue, 10 Sep 2024 23:48:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726037289; cv=none; d=google.com; s=arc-20240605; b=hiwLViiLmWPMigmZklXwNDsLavD2I5TE4htQfcDAh08Qx+03bVHX6HOGF4bGgwlnfg P6xbQ2bohzSuA6UE5W9FmQdTaK5Bw8E9vxk8KJZ4jk5pd63OxRb48KfTfnJxEKT0LU4U HSQNtY4TsKxU/VnZ5igS2OA5tNwXfGSg3aFulU4/qt0G1jjToV1KBTzsVNMA49tZZ3ba XyIe6AL5sEYIuuSXOTdEw46xeMmvoGqK0SLoH37ZAT+TtQCfdrfg+oy8hVpfIRZzxFia HVXQvkk5q4Wi0/5yE1aQyO63QGITPxIl2xW1v/YfWZzNN4a3GoTmOuOH0r1Ya9EXE3YQ SmUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xZeJwMfmwPhn6K+eX+cbow6SlfP8ZHC3JgNR1OvZmEk=; fh=o+EvzwQbrAYBWzH9Tvato/dU9jd8yIvBYxjsNNxa6cI=; b=QaZ/jUVuwNMOrfT/tkOiaqXbGSUdIVMrTOOD4G+XfkEjW+nAwUaId15uKfzbhsYAtO bJlAvYgpu6foDkdy0qhLy4MhlDSn9G3k+fRSYj09yX9NzThQDUlL0a0+1vcDEqmfL4Db t6pFqU7pkn2joY1jON74ebRCy9rseYN4RHunu++BiYTGyiIhKadRyYK6H7DU3V+DxgWy VBrh39dEvlKsSUOQV0u4dnku1F+PZNx8N4r5IWs0TA+EuRrOaO6uzCVH3iTdONKmHgYo rAc+Guj2aSIE8c3MSFf840IKgp77ijQk1FCVVo/eoKMNsgpSW1Ad+OiGMbV96FcSHsfe dx6A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WhbFR9gY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6c5347bddcfsi98425086d6.441.2024.09.10.23.48.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2024 23:48:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WhbFR9gY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soH83-00012Y-6p; Wed, 11 Sep 2024 02:47:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soH7z-0000pF-VG for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:47:00 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soH7v-0004Qc-Oz for qemu-devel@nongnu.org; Wed, 11 Sep 2024 02:46:59 -0400 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-a8a7b1c2f2bso258175466b.0 for ; Tue, 10 Sep 2024 23:46:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726037214; x=1726642014; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xZeJwMfmwPhn6K+eX+cbow6SlfP8ZHC3JgNR1OvZmEk=; b=WhbFR9gYzHMeY6h4drMsOdw7KS4Xr9bUzIwgAmS8qxklifRnEJuFp6gDQdgEi3Is/G zzf2BA4XvpHc8UgLoeYqw8PfzuFofzhRztplarfpyTEyb3J2gawVe0q0y9wDX3Nhw8+X 6/D9rx8CCyqEV/ikV42JqcWOcRwcJgmWlcU63wVzRPqBcXHTUazMI1spQPRWTgXpeIjy hgGsB3+mmqd3EjFAFkhepU1hKRNGnnYQez5n7kJITYQuUM0balrcOgWCOGnehPcCNKIw GoH+7TCqmFB33F6ZZBW0f/NQqw0NSLC0GJJ16bh+GD+vSd5PVwRAZmxEVVtHXyf6XNe/ 57lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726037214; x=1726642014; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xZeJwMfmwPhn6K+eX+cbow6SlfP8ZHC3JgNR1OvZmEk=; b=CU3qyLJM+UwxJrnb2lcAw14oBRPTK8h1wojPOge5WvjiC4cMmx81tA+SJQ9T2bPa+X 66pf+0hoRVODwdPvvXjUtsDl1bwvEb7SONfJql0AcDrQtS2UejSUUJZc8u13vKXU2PWh h7GzE7St8GhPZQfy/cj92u03W9TbeY+RPnWk9HKEAk2ylogMSPSy7en5086N7SaSwO3r m/knlF+sAMjbYVmPcYJZUr8xYYn8LZLOxZXH6EgCs+qR1VeqfKllqm0/Gdr6ujZdXsz8 PGK522j73wgh/DLhgL6q30tIPc7NbOjsBMSG0bztyHvdC67ZgQ1mUkBbkhY2+Mnq8ua5 fF0A== X-Gm-Message-State: AOJu0YzTGY9RHryal8QbTdVWYnhly+ZW9S6MaaBcF4R3L4LkEQILizph /ZjtNNMkzgVXzh1rU25+Hh5hfoOm+7y3Ga6NLmX12hEqSSSF6l9BDI2QW+qZ3ao= X-Received: by 2002:a17:907:1c09:b0:a8d:7b7d:8c47 with SMTP id a640c23a62f3a-a9004aba65dmr208943566b.59.1726037213736; Tue, 10 Sep 2024 23:46:53 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25c72e7fsm574216166b.109.2024.09.10.23.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 23:46:50 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 071745FA6C; Wed, 11 Sep 2024 07:46:47 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gustavo Romero , =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Thomas Huth , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PULL 10/10] tests/tcg/aarch64: Extend MTE gdbstub tests to system mode Date: Wed, 11 Sep 2024 07:46:45 +0100 Message-Id: <20240911064645.357592-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911064645.357592-1-alex.bennee@linaro.org> References: <20240911064645.357592-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Gustavo Romero Extend MTE gdbstub tests to also run in system mode (share tests between user mode and system mode). The tests will only run if a version of GDB that supports MTE on baremetal is available in the test environment and if available compiler supports the 'memtag' flag (-march=armv8.5-a+memtag). For the tests running in system mode, a page that supports MTE ops. is necessary. Therefore, an MTE-enabled page is made available (mapped) in the third 2 MB chunk of the second 1 GB space in the flat mapping set in boot.S. A new binary, mte.S, is also introduced for the tests. It links against boot.S and is executed by QEMU in system mode. Signed-off-by: Gustavo Romero Message-Id: <20240906143316.657436-6-gustavo.romero@linaro.org> [AJB: fix stray _] Signed-off-by: Alex Bennée Message-Id: <20240910173900.4154726-11-alex.bennee@linaro.org> diff --git a/configure b/configure index 39a284ddfe..7f6eb6b331 100755 --- a/configure +++ b/configure @@ -1679,6 +1679,11 @@ for target in $target_list; do echo "GDB_HAS_MTE=y" >> $config_target_mak fi + if test "${gdb_arches#*aarch64}" != "$gdb_arches" && version_ge $gdb_version 16.0; then + # GDB has to support MTE in baremetal to allow debugging MTE in QEMU system mode + echo "GDB_SUPPORTS_MTE_IN_BAREMETAL=y" >> $config_target_mak + fi + echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs tcg_tests_targets="$tcg_tests_targets $target" fi diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/Makefile.softmmu-target index 139e04d15f..d08d9b01de 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -2,14 +2,22 @@ # Aarch64 system tests # -AARCH64_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/aarch64/system +AARCH64_SRC=$(SRC_PATH)/tests/tcg/aarch64 +AARCH64_SYSTEM_SRC=$(AARCH64_SRC)/system + VPATH+=$(AARCH64_SYSTEM_SRC) # These objects provide the basic boot code and helper functions for all tests CRT_OBJS=boot.o -AARCH64_TEST_SRCS=$(wildcard $(AARCH64_SYSTEM_SRC)/*.c) -AARCH64_TESTS = $(patsubst $(AARCH64_SYSTEM_SRC)/%.c, %, $(AARCH64_TEST_SRCS)) +AARCH64_TEST_C_SRCS=$(wildcard $(AARCH64_SYSTEM_SRC)/*.c) +AARCH64_TEST_S_SRCS=$(AARCH64_SYSTEM_SRC)/mte.S + +AARCH64_C_TESTS = $(patsubst $(AARCH64_SYSTEM_SRC)/%.c, %, $(AARCH64_TEST_C_SRCS)) +AARCH64_S_TESTS = $(patsubst $(AARCH64_SYSTEM_SRC)/%.S, %, $(AARCH64_TEST_S_SRCS)) + +AARCH64_TESTS = $(AARCH64_C_TESTS) +AARCH64_TESTS += $(AARCH64_S_TESTS) CRT_PATH=$(AARCH64_SYSTEM_SRC) LINK_SCRIPT=$(AARCH64_SYSTEM_SRC)/kernel.ld @@ -21,7 +29,8 @@ LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc config-cc.mak: Makefile $(quiet-@)( \ - $(call cc-option,-march=armv8.3-a, CROSS_CC_HAS_ARMV8_3)) 3> config-cc.mak + $(call cc-option,-march=armv8.3-a, CROSS_CC_HAS_ARMV8_3); \ + $(call cc-option,-march=armv8.5-a+memtag, CROSS_CC_HAS_ARMV8_MTE)) 3> config-cc.mak -include config-cc.mak # building head blobs @@ -88,3 +97,35 @@ pauth-3: run-pauth-3: $(call skip-test, "RUN of pauth-3", "not built") endif + +ifneq ($(CROSS_CC_HAS_ARMV8_MTE),) +QEMU_MTE_ENABLED_MACHINE=-M virt,mte=on -cpu max -display none +QEMU_OPTS_WITH_MTE_ON = $(QEMU_MTE_ENABLED_MACHINE) $(QEMU_BASE_ARGS) -kernel +mte: CFLAGS+=-march=armv8.5-a+memtag +mte: mte.S $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +run-mte: QEMU_OPTS=$(QEMU_OPTS_WITH_MTE_ON) +run-mte: mte + +ifeq ($(GDB_SUPPORTS_MTE_IN_BAREMETAL),y) +run-gdbstub-mte: QEMU_OPTS=$(QEMU_OPTS_WITH_MTE_ON) +run-gdbstub-mte: mte + $(call run-test, $@, $(GDB_SCRIPT) \ + --output run-gdbstub-mte.out \ + --gdb $(GDB) \ + --qemu $(QEMU) --qargs "-chardev null$(COMMA)id=output $(QEMU_OPTS)" \ + --bin $< --test $(AARCH64_SRC)/gdbstub/test-mte.py -- --mode=system, \ + gdbstub MTE support) + +EXTRA_RUNS += run-gdbstub-mte +else # !GDB_SUPPORTS_MTE_IN_BAREMETAL +run-gdbstub-mte: + $(call skip-test "RUN of gdbstub-mte", "GDB does not support MTE in baremetal!") +endif +else # !CROSS_CC_HAS_ARMV8_MTE +mte: + $(call skip-test, "BUILD of $@", "missing compiler support") +run-mte: + $(call skip-test, "RUN of mte", "not build") +endif diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 8cc62eb456..9efe2f81ad 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -138,7 +138,8 @@ run-gdbstub-mte: mte-8 $(call run-test, $@, $(GDB_SCRIPT) \ --gdb $(GDB) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ - --bin $< --test $(AARCH64_SRC)/gdbstub/test-mte.py, \ + --bin $< --test $(AARCH64_SRC)/gdbstub/test-mte.py \ + -- --mode=user, \ gdbstub MTE support) EXTRA_RUNS += run-gdbstub-mte diff --git a/tests/tcg/aarch64/gdbstub/test-mte.py b/tests/tcg/aarch64/gdbstub/test-mte.py index 66f9c25f8a..a4cae6caa0 100644 --- a/tests/tcg/aarch64/gdbstub/test-mte.py +++ b/tests/tcg/aarch64/gdbstub/test-mte.py @@ -1,21 +1,26 @@ from __future__ import print_function # # Test GDB memory-tag commands that exercise the stubs for the qIsAddressTagged, -# qMemTag, and QMemTag packets. Logical tag-only commands rely on local -# operations, hence don't exercise any stub. +# qMemTag, and QMemTag packets, which are used for manipulating allocation tags. +# Logical tags-related commands rely on local operations, hence don't exercise +# any stub and so are not used in this test. # -# The test consists in breaking just after a atag() call (which sets the -# allocation tag -- see mte-8.c for details) and setting/getting tags in -# different memory locations and ranges starting at the address of the array -# 'a'. +# The test consists in breaking just after a tag is set in a specific memory +# chunk, and then using the GDB 'memory-tagging' subcommands to set/get tags in +# different memory locations and ranges in the MTE-enabled memory chunk. # # This is launched via tests/guest-debug/run-test.py # -import gdb +try: + import gdb +except ModuleNotFoundError: + from sys import exit + exit("This script must be launched via tests/guest-debug/run-test.py!") import re -from test_gdbstub import main, report +from sys import argv +from test_gdbstub import arg_parser, main, report PATTERN_0 = "Memory tags for address 0x[0-9a-f]+ match \\(0x[0-9a-f]+\\)." @@ -23,12 +28,32 @@ def run_test(): - gdb.execute("break 95", False, True) + p = arg_parser(prog="test-mte.py", description="TCG MTE tests.") + p.add_argument("--mode", help="Run test for QEMU system or user mode.", + required=True, choices=['system','user']) + + args = p.parse_args(args=argv) + + if args.mode == "system": + # Break address: where to break before performing the tests + # See mte.S for details about this label. + ba = "main_end" + # Tagged address: the start of the MTE-enabled memory chunk to be tested + # 'tagged_addr' (x1) is a pointer to the MTE-enabled page. See mte.S. + ta = "$x1" + else: # mode="user" + # Line 95 in mte-8.c + ba = "95" + # 'a' array. See mte-8.c + ta = "a" + + gdb.execute(f"break {ba}", False, True) gdb.execute("continue", False, True) + try: - # Test if we can check correctly that the allocation tag for - # array 'a' matches the logical tag after atag() is called. - co = gdb.execute("memory-tag check a", False, True) + # Test if we can check correctly that the allocation tag for the address + # in {ta} matches the logical tag in {ta}. + co = gdb.execute(f"memory-tag check {ta}", False, True) tags_match = re.findall(PATTERN_0, co, re.MULTILINE) if tags_match: report(True, f"{tags_match[0]}") @@ -39,20 +64,20 @@ def run_test(): # tags rely on local operation and so don't exercise any stub. # Set the allocation tag for the first granule (16 bytes) of - # address starting at 'a' address to a known value, i.e. 0x04. - gdb.execute("memory-tag set-allocation-tag a 1 04", False, True) + # address starting at {ta} address to a known value, i.e. 0x04. + gdb.execute(f"memory-tag set-allocation-tag {ta} 1 04", False, True) # Then set the allocation tag for the second granule to a known # value, i.e. 0x06. This tests that contiguous tag granules are - # set correct and don't run over each other. - gdb.execute("memory-tag set-allocation-tag a+16 1 06", False, True) + # set correctly and don't run over each other. + gdb.execute(f"memory-tag set-allocation-tag {ta}+16 1 06", False, True) # Read the known values back and check if they remain the same. - co = gdb.execute("memory-tag print-allocation-tag a", False, True) + co = gdb.execute(f"memory-tag print-allocation-tag {ta}", False, True) first_tag = re.match(PATTERN_1, co)[1] - co = gdb.execute("memory-tag print-allocation-tag a+16", False, True) + co = gdb.execute(f"memory-tag print-allocation-tag {ta}+16", False, True) second_tag = re.match(PATTERN_1, co)[1] if first_tag == "0x4" and second_tag == "0x6": @@ -61,15 +86,15 @@ def run_test(): report(False, "Can't set/print allocation tags!") # Now test fill pattern by setting a whole page with a pattern. - gdb.execute("memory-tag set-allocation-tag a 4096 0a0b", False, True) + gdb.execute(f"memory-tag set-allocation-tag {ta} 4096 0a0b", False, True) # And read back the tags of the last two granules in page so # we also test if the pattern is set correctly up to the end of # the page. - co = gdb.execute("memory-tag print-allocation-tag a+4096-32", False, True) + co = gdb.execute(f"memory-tag print-allocation-tag {ta}+4096-32", False, True) tag = re.match(PATTERN_1, co)[1] - co = gdb.execute("memory-tag print-allocation-tag a+4096-16", False, True) + co = gdb.execute(f"memory-tag print-allocation-tag {ta}+4096-16", False, True) last_tag = re.match(PATTERN_1, co)[1] if tag == "0xa" and last_tag == "0xb": @@ -78,8 +103,8 @@ def run_test(): report(False, "Fill pattern failed!") except gdb.error: - # This usually happens because a GDB version that does not - # support memory tagging was used to run the test. + # This usually happens because a GDB version that does not support + # memory tagging was used to run the test. report(False, "'memory-tag' command failed!") diff --git a/tests/tcg/aarch64/system/boot.S b/tests/tcg/aarch64/system/boot.S index 501685d0ec..4eb1b35b88 100644 --- a/tests/tcg/aarch64/system/boot.S +++ b/tests/tcg/aarch64/system/boot.S @@ -135,6 +135,17 @@ __start: orr x1, x1, x3 str x1, [x2] /* 2nd 2mb (.data & .bss)*/ + /* Third block: at 'mte_page', set in kernel.ld */ + adrp x1, mte_page + add x1, x1, :lo12:mte_page + bic x1, x1, #(1 << 21) - 1 + and x4, x1, x5 + add x2, x0, x4, lsr #(21 - 3) + /* attr(AF, NX, block, AttrIndx=Attr1) */ + ldr x3, =(3 << 53) | 0x401 | (1 << 2) + orr x1, x1, x3 + str x1, [x2] + /* Setup/enable the MMU. */ /* diff --git a/tests/tcg/aarch64/system/kernel.ld b/tests/tcg/aarch64/system/kernel.ld index 5f39258d32..aef043e31d 100644 --- a/tests/tcg/aarch64/system/kernel.ld +++ b/tests/tcg/aarch64/system/kernel.ld @@ -7,6 +7,8 @@ MEMORY { TXT (rx) : ORIGIN = 1 << 30, LENGTH = 2M /* Align r/w data to the 2nd 2 MiB chunk. */ DAT (rw) : ORIGIN = (1 << 30) + 2M, LENGTH = 2M + /* Align the MTE-enabled page to the 3rd 2 MiB chunk. */ + TAG (rw) : ORIGIN = (1 << 30) + 4M, LENGTH = 2M } SECTIONS { @@ -18,6 +20,13 @@ SECTIONS { *(.data) *(.bss) } >DAT + .tag : { + /* + * Symbol 'mte_page' is used in boot.S to setup the PTE and in the mte.S + * test as the address that the MTE instructions operate on. + */ + mte_page = .; + } >TAG /DISCARD/ : { *(.ARM.attributes) } diff --git a/tests/tcg/aarch64/system/mte.S b/tests/tcg/aarch64/system/mte.S new file mode 100644 index 0000000000..b611240a95 --- /dev/null +++ b/tests/tcg/aarch64/system/mte.S @@ -0,0 +1,109 @@ +/* + * Code to help test the MTE gdbstubs in system mode. + * + * Copyright (c) 2024 Linaro Limited + * + * Author: Gustavo Romero + * + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#define addr x0 /* Ptr to the start of the MTE-enabled page. */ +#define tagged_addr x1 /* 'addr' ptr with a random-generated tag added. */ +#define tmp0 x2 /* Scratch register. */ +#define tmp1 x3 /* Scratch register. */ +#define tmp2 x4 /* Scratch register. */ +#define tmp3 x5 /* Sctatch register. */ + + .file "mte.S" + + .text + .align 4 + + .globl main + .type main, @function + +main: + /* + * Set MAIR_EL1 (Memory Attribute Index Register). In boot.S, the + * attribute index for .mte_page is set to point to MAILR_EL field Attr1 + * (AttrIndx=Attr1), so set Attr1 as Tagged Normal (MTE) to enable MTE + * on this page. + * + * Attr1 = 0xF0 => Tagged Normal (MTE) + */ + mrs tmp0, mair_el1 + orr tmp0, tmp0, (0xF0 << 8) + msr mair_el1, tmp0 + + /* + * Set TCR_EL1 (Translation Control Registers) to ignore the top byte + * in the translated addresses so it can be used to keep the tags. + * + * TBI0[37] = 0b1 => Top Byte ignored and used for tagged addresses + */ + mrs tmp1, tcr_el1 + orr tmp1, tmp1, (1 << 37) + msr tcr_el1, tmp1 + + /* + * Set SCTLR_EL1 (System Control Register) to enable the use of MTE + * insns., like stg & friends, and to enable synchronous exception in + * case of a tag mismatch, i.e., when the logical tag in 'tagged_addr' + * is different from the allocation tag related to 'addr' address. + * + * ATA[43] = 0b1 => Enable access to allocation tags at EL1 + * TCF[41:40] = 0b01 => Tag Check Faults cause a synchronous exception + * + */ + mrs tmp2, sctlr_el1 + mov tmp3, (1 << 43) | (1 << 40) + orr tmp2, tmp2, tmp3 + msr sctlr_el1, tmp2 + + isb + + /* + * MTE-enabled page resides at the 3rd 2MB chunk in the second 1GB + * block, i.e., at 0x40400000 address. See .mte_page section in boot.S + * and kernel.ld (where the address is effectively computed). + * + * Load .mte_page address into 'addr' register. + */ + adrp addr, mte_page + add addr, addr, :lo12:mte_page + + /* + * Set GCR for random tag generation. 0xA5 is just a random value to set + * GCR != 0 so the tag generated by 'irg' insn. is not zero, which is + * more interesting for the tests than when tag is zero. + */ + mov tmp0, 0xA5 + msr gcr_el1, tmp0 + + /* + * Generate a logical tag, add it to 'addr' address and put it into + * 'tagged_addr'. + */ + irg tagged_addr, addr + + /* + * Store the generated tag to memory region pointed to by 'addr', i.e. + * set the allocation tag for granule at 'addr'. The tag is extracted + * by stg from tagged_addr pointer. + */ + stg tagged_addr, [addr] + + /* + * Store a random value (0xdeadbeef) to tagged_addr address. This must + * not cause any Tag Check Fault since logical tag in tagged_addr and + * allocation tag associated with the memory pointed by tagged_addr are + * set the same, otherwise something is off and the test fails -- an + * exception is generated. + */ + ldr tmp1, =0xdeadbeef + str tmp1, [tagged_addr] + + /* This label is used by GDB Python script test-mte.py. */ +main_end: + ret