From nobody Sat Nov 15 07:43:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1753453419; cv=none; d=zohomail.com; s=zohoarc; b=IDkIm2X5cHQJvUGialoVn3mHt/a7YSUINpqsd/hGAhr44LbMhSKI5pf8VCUQHZq3+VCJTlYlRBCEaZngscN2WIfluTeoQqPIaxDZRuVOotBefatMGPOJLftKZBpfilA0FzfsCpTpZNwrO+5KReoIMT1EEskETnqiHF8yx/ePyC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753453419; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ykNmFy+pOc7x1JD04m7Jgyqi4BaE5vw5X8kVsc3ZDDI=; b=d40gbs4CCQ+4awyTkSRP/JnYH+j8OGrJ3A1sqr/bxuTIRyCPWpIo223Lapn2YFF7I/lSuwMeKPXQ8bA6l5t9oBU+u50uHMvmAr+eszHn6QeDQAE4Zotnq131iD5MHi3SipP/rl0OKGUWVxAWGs8q6Q1sIoP0xdZ1MUXQq7DMExc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1753453419042217.93120491935247; Fri, 25 Jul 2025 07:23:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufJKG-0000l4-KQ; Fri, 25 Jul 2025 10:23:08 -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 1ufJJv-0000Mo-RL for qemu-devel@nongnu.org; Fri, 25 Jul 2025 10:22:48 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufJJt-0006Rd-EH for qemu-devel@nongnu.org; Fri, 25 Jul 2025 10:22:47 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3a54700a463so1387169f8f.1 for ; Fri, 25 Jul 2025 07:22:44 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b778eb2bccsm67065f8f.7.2025.07.25.07.22.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jul 2025 07:22:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753453364; x=1754058164; 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=ykNmFy+pOc7x1JD04m7Jgyqi4BaE5vw5X8kVsc3ZDDI=; b=NRfrj/u6WOBAYCVNqaAWrvQ9q6spfYV/ytYcDcWXgsvBJCN4T+hFojwyvcrZN+/aO/ Es89r1IKBxC9su4VGZcmKRcn+KiiFRa1z/IW/J0PfYTlz8hJuGnBHeSlRe8JT1P7hgm5 rp+N3heU4fFwtC90iN54ha+b7Epvoqi9pa56AWBRjOQNrF/vuojelOPpGXNY3Khql0Xl C7kkNbxnoqPmsEK73/17QCT9j/+zPWPdTU3quivwt4bFthkT7Ouz1qafiXNNAOfaNt3m exD/WT0c4Pmjybyw3oomwP9XI9TiLrVxGSAlAtPKH0CEOAajOPVevh/b5DyTOji2yovt WRjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753453364; x=1754058164; 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=ykNmFy+pOc7x1JD04m7Jgyqi4BaE5vw5X8kVsc3ZDDI=; b=kVyTapPTYZ6iUEVtSq0alof+PIOkOtG95kOBXkOHFcFn0oSuc9u/2NQgYeYAsM/3d4 XIbRqTOfoXi4rgdWKNHsL3nGPLVw2o5jLKRHovod0QkTj1pFgmF2GjwpZ/ho/m5VRNOX rk2LY2xDwrLMaHmiwfMfR72SEBSl0cVoKk9QbenOf3G2e5rbP0ia4qXLsyuY6+beis4o LBYEt9BpLtyujZBXDHEuKiWyrLEQ19DBsBKFyro7fp3q1Gu2KDFFQg3A0QvlfT01w+yt qr61ZMSikIDcD1FkfxJMWutX+ZR4unvqbsZ74ZR7DBJmMrsRlvbPr/T+Tpe2NP6FNmLX fbIg== X-Forwarded-Encrypted: i=1; AJvYcCUHV0HR+fKd5pCkgLITiLjF+cDs/H3TYGtEwiRgNROScgGyMy9ru7Ey61sQScgnIkwNQuhoBAw9ZzQw@nongnu.org X-Gm-Message-State: AOJu0YxV7z25PIbW+KglzugoaeIBcYbYBqYwv6v2sSmWWCI3jD2WUyI6 vU1fhjH7hqsU52lyI5MhlgsQjD/Naw3vz+1f4YamO6G5VcdBEOpyPSvO2KQRhfSXNoo= X-Gm-Gg: ASbGncsMUL738O5ZUvBvfpisx5BO0R7Gw1BoRhr784If9Ws7V4V+szJd8vSg1MQUBg0 yeSsDP2dSXxncYWK64aqDQiPjZGrFhQpNigxPaBqIOIpLDwIUbaXfmOwWzsYD7PBAifvSwzUy3D CLJAZ76djgK0GhCAQFSuJxq6pXUgbxbCqaQC5uDLeE3/FAvgcEPXVsW4TOWMKV8ah2APbBg5XJy 3QeaEV5uYUS1Bn04H3lntTXS+1cqG+FYtYqUDsXRNnYJWx0gnh7Mk/eAws4TFgC5iWj7y3kX59e 52tJEte02QrogoV4am5Q0Kji8t5NyBY0f+r/9PlxeFadqjdFaNi+h27PkhtVTzwD8iC1mxN2yan F/MfV6CVw+/lPAOIekw01pkIIWrWH X-Google-Smtp-Source: AGHT+IE5ha+ioBRABL/EzlXJGYoKgf5uPNcbCCSMyuv9hxhXtm6enS92ojhAlrs7TmkYBU/M6oT7NA== X-Received: by 2002:a05:6000:40ca:b0:3b6:162a:8e08 with SMTP id ffacd0b85a97d-3b77123f244mr5341767f8f.12.1753453363895; Fri, 25 Jul 2025 07:22:43 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Richard Henderson , Laurent Vivier Subject: [PATCH for-10.1 1/3] linux-user/aarch64: Clear TPIDR2_EL0 when delivering signals Date: Fri, 25 Jul 2025 15:22:38 +0100 Message-ID: <20250725142240.3760452-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250725142240.3760452-1-peter.maydell@linaro.org> References: <20250725142240.3760452-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1753453420783116600 Content-Type: text/plain; charset="utf-8" A recent change to the kernel (Linux commit b376108e1f88 "arm64/fpsimd: signal: Clear TPIDR2 when delivering signals") updated the signal-handler entry code to always clear TPIDR2_EL0. This is necessary for the userspace ZA lazy saving scheme to work correctly when unwinding exceptions across a signal boundary. (For the essay-length description of the incorrect behaviour and why this is the correct fix, see the commit message for the kernel commit.) Make QEMU also clear TPIDR2_EL0 on signal entry, applying the equivalent bugfix to our implementation. Note that getting this unwinding to work correctly also requires changes to the userspace code, e.g. as implemented in gcc in https://gcc.gnu.org/git/?p=3Dgcc.git;a=3Dcommit;h=3Db5ffc8e75a8 This change is technically an ABI change; from the kernel's point of view SME was never enabled (it was hidden behind CONFIG_BROKEN) before the change. From QEMU's point of view our SME-related signal handling was broken anyway as we weren't saving and restoring TPIDR2_EL0. Cc: qemu-stable@nongnu.org Fixes: 78011586b90d1 ("target/arm: Enable SME for user-only") Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- linux-user/aarch64/signal.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux-user/aarch64/signal.c b/linux-user/aarch64/signal.c index d50cab78d83..b4bab7c040d 100644 --- a/linux-user/aarch64/signal.c +++ b/linux-user/aarch64/signal.c @@ -668,6 +668,9 @@ static void target_setup_frame(int usig, struct target_= sigaction *ka, =20 /* Invoke the signal handler with both SM and ZA disabled. */ aarch64_set_svcr(env, 0, R_SVCR_SM_MASK | R_SVCR_ZA_MASK); + if (cpu_isar_feature(aa64_sme, env_archcpu(env))) { + env->cp15.tpidr2_el0 =3D 0; + } =20 if (info) { frame->info =3D *info; --=20 2.43.0 From nobody Sat Nov 15 07:43:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1753453459; cv=none; d=zohomail.com; s=zohoarc; b=li3PjTUtjrpohLqgxPp4dxLKmkyzcxCc5Th47dlK0ijpJ3xtmtw+KKlYXV35wCTJCAE824SGHj8qaA5VeAtuEtKhEr8DsMWVIEGnOCke+cZVQY2v2SdHjHFk3nd2wz0B/PbPLh7pU8iK4Cyh/Xnrb3IRDbcekgW4cSHJPV6sg7I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753453459; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qvG0fxUvz8Y62ReZMLVv2RqS5GQS2D6eRWB6o9INM7U=; b=cPh2S3opIuOe0QW0hPkEzt8bjK73+Mo6Gp/DoaarxHUabFRpbxs0Rqlzye7ZkeTZZsBuJtYfxpSahACtkiQ/pYcUO0pDc6KwXg/RArXA8/bgdkyXl1CZ57s4uwFgbKrZasFK3gxuUf6Z3U+2pcBXkV8vDKR2GR4tpiqx73bJeeg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1753453459474823.6369639990213; Fri, 25 Jul 2025 07:24:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufJKH-0000qP-Ha; Fri, 25 Jul 2025 10:23:09 -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 1ufJJx-0000QP-9R for qemu-devel@nongnu.org; Fri, 25 Jul 2025 10:22:52 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufJJv-0006Ry-2d for qemu-devel@nongnu.org; Fri, 25 Jul 2025 10:22:48 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3b776d57656so639731f8f.0 for ; Fri, 25 Jul 2025 07:22:46 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b778eb2bccsm67065f8f.7.2025.07.25.07.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jul 2025 07:22:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753453365; x=1754058165; 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=qvG0fxUvz8Y62ReZMLVv2RqS5GQS2D6eRWB6o9INM7U=; b=TkbifmxVnGNctKutmms261OHM96jFnlne8IRJYCPotU8C/qBIsDrRc1EYk6ymYJ+vJ L8TN6m8n5ZPe1eyE9icCFnvmBw0zwmy772iLoyYlOvo7DEcTqr/q4HbmLvgSiLTqGB1Q Xdd8Eo/Ff4R/4e0DTqT2oKdZTsonYivFdfw3uXhxOy8DEOQwibIg6+c9Op8chtt7Mahb cV5tvZfhQBpL6UemUG73IocJMY7mYUjUR7aqaIWqtAEUaXKrDwf6ZhPHhf5CaugY/+k+ Q/FeRuNWbzS/FRDBhjM+mTzNMGKCbtmuniOu9qzcnfkc+QvxsundpeFmW55TuT2Mkoev lWjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753453365; x=1754058165; 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=qvG0fxUvz8Y62ReZMLVv2RqS5GQS2D6eRWB6o9INM7U=; b=Q6yKD4oqeUsILcx+lJ/Y0sv3Uy0Ls7DAxzoEfP1dfEVWUmlMN97nB8BQVom8m8lRbr 5dQ9+iNqKO1o4FV6OLgCCAhlfKS7Cxgx07O+EJkx18BAFawIZcv54Pl8BgYErPb4KhjS gLOVFXbcB4vP3rI0paPlk26R3ZVt2KO3Z+SU9J/Iu6eJxHj/xUbN/0J5yrVbdUmdtblU yI9hcq1nE+L6GhoLhtmePBOqTR4AknkchQEu6mJYEA/3ERufDLVmrGX2p/ULpDQuCnqc ISaQxYQ2qycyTfblRwhv8C6CJ4M6VERBrlYgenD81V+KZV0IThjCZdDnxHQL4g9D6rXi jK9Q== X-Forwarded-Encrypted: i=1; AJvYcCX8ucVS04APO9oT1yWo4Hb3SOnsMK6dHlRb9ll1zYaXCwqh6KUMVCjJcRjRXqTHDsXXyNvUE/k5jtwQ@nongnu.org X-Gm-Message-State: AOJu0YwFi7oQ3Wl7mXeQLjWAnch91VmrDinHMplCWq/GpdT9Ys34mQxi O59a0cZK25+5mLnu/JcE3SMwYEnR3ZicnRtLGJsyJP55uJDdxD2uyVfmJqZzjtzW0zI= X-Gm-Gg: ASbGncvNCAmlAjqsdFj9FF55AYnmFyqNF3SNx0ccbhxfRgFL6vtVOgz1tsKC70dG1eu Z7DAN2DXWhnyGk60rZ32BVjFuNrq89mwiwmkXCKW+03eKSuJgEy+5CaTJA618o9bnRBfVb97DlL 2yymFDdrS/HXjKuJ30wq+GaeHp7ACPa+/PDKA0bk+qGQr39rZpOQrtyIuElFC1+RRhlt/eBPNPR vevNCIhRzby7uMmK4MjW3YuxRtxgto2A8vhEdiDDVzWUyA94JpXy/FuF0xdnPUSqmPRW+hO2wVo knPtyLQ+rYRunXAn4YRscQytZY9/2xGgz7Q5rUa6pjTZfuV0xi2HG1y4nytwg0VYVIT2RleiRrV HLJiKGZix8ryPQA6kMDArc4EeA1+8ekWCyeqXp+A= X-Google-Smtp-Source: AGHT+IGtNffQ0vrEuFFyrbMzAASfuzQ/HNGc4JPqRujCOqVLeMAa9cfR4GSR1lp1iqmqlNIiUBNIoQ== X-Received: by 2002:a05:6000:1887:b0:3b1:9259:3ead with SMTP id ffacd0b85a97d-3b776642745mr1792785f8f.28.1753453365150; Fri, 25 Jul 2025 07:22:45 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Richard Henderson , Laurent Vivier Subject: [PATCH for-10.1 2/3] linux-user/aarch64: Support TPIDR2_MAGIC signal frame record Date: Fri, 25 Jul 2025 15:22:39 +0100 Message-ID: <20250725142240.3760452-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250725142240.3760452-1-peter.maydell@linaro.org> References: <20250725142240.3760452-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1753453461474116600 Content-Type: text/plain; charset="utf-8" FEAT_SME adds the TPIDR2 userspace-accessible system register, which is used as part of the procedure calling standard's lazy saving scheme for the ZA registers: https://github.com/ARM-software/abi-aa/blob/main/aapcs64/aapcs64.rst#66the= -za-lazy-saving-scheme The Linux kernel has a signal frame record for saving and restoring this value when calling signal handlers, but we forgot to implement this. The result is that code which tries to unwind an exception out of a signal handler will not work correctly. Add support for the missing record. Cc: qemu-stable@nongnu.org Fixes: 78011586b90d1 ("target/arm: Enable SME for user-only") Signed-off-by: Peter Maydell --- linux-user/aarch64/signal.c | 46 +++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/linux-user/aarch64/signal.c b/linux-user/aarch64/signal.c index b4bab7c040d..9a903576add 100644 --- a/linux-user/aarch64/signal.c +++ b/linux-user/aarch64/signal.c @@ -121,6 +121,13 @@ struct target_za_context { #define TARGET_ZA_SIG_CONTEXT_SIZE(VQ) \ TARGET_ZA_SIG_ZAV_OFFSET(VQ, VQ * TARGET_SVE_VQ_BYTES) =20 +#define TARGET_TPIDR2_MAGIC 0x54504902 + +struct target_tpidr2_context { + struct target_aarch64_ctx head; + uint64_t tpidr2; +}; + struct target_rt_sigframe { struct target_siginfo info; struct target_ucontext uc; @@ -253,6 +260,14 @@ static void target_setup_za_record(struct target_za_co= ntext *za, } } =20 +static void target_setup_tpidr2_record(struct target_tpidr2_context *tpidr= 2, + CPUARMState *env, int size) +{ + __put_user(TARGET_TPIDR2_MAGIC, &tpidr2->head.magic); + __put_user(sizeof(struct target_tpidr2_context), &tpidr2->head.size); + __put_user(env->cp15.tpidr2_el0, &tpidr2->tpidr2); +} + static void target_restore_general_frame(CPUARMState *env, struct target_rt_sigframe *sf) { @@ -403,6 +418,16 @@ static bool target_restore_za_record(CPUARMState *env, return true; } =20 +static bool target_restore_tpidr2_record(CPUARMState *env, + struct target_tpidr2_context *tpi= dr2) +{ + if (!cpu_isar_feature(aa64_sme, env_archcpu(env))) { + return false; + } + __get_user(env->cp15.tpidr2_el0, &tpidr2->tpidr2); + return true; +} + static int target_restore_sigframe(CPUARMState *env, struct target_rt_sigframe *sf) { @@ -410,6 +435,7 @@ static int target_restore_sigframe(CPUARMState *env, struct target_fpsimd_context *fpsimd =3D NULL; struct target_sve_context *sve =3D NULL; struct target_za_context *za =3D NULL; + struct target_tpidr2_context *tpidr2 =3D NULL; uint64_t extra_datap =3D 0; bool used_extra =3D false; int sve_size =3D 0; @@ -460,6 +486,13 @@ static int target_restore_sigframe(CPUARMState *env, za_size =3D size; break; =20 + case TARGET_TPIDR2_MAGIC: + if (tpidr2 || size !=3D sizeof(struct target_tpidr2_context)) { + goto err; + } + tpidr2 =3D (struct target_tpidr2_context *)ctx; + break; + case TARGET_EXTRA_MAGIC: if (extra || size !=3D sizeof(struct target_extra_context)) { goto err; @@ -497,6 +530,9 @@ static int target_restore_sigframe(CPUARMState *env, if (za && !target_restore_za_record(env, za, za_size, &svcr)) { goto err; } + if (tpidr2 && !target_restore_tpidr2_record(env, tpidr2)) { + goto err; + } if (env->svcr !=3D svcr) { env->svcr =3D svcr; arm_rebuild_hflags(env); @@ -568,8 +604,8 @@ static void target_setup_frame(int usig, struct target_= sigaction *ka, .total_size =3D offsetof(struct target_rt_sigframe, uc.tuc_mcontext.__reserved), }; - int fpsimd_ofs, fr_ofs, sve_ofs =3D 0, za_ofs =3D 0; - int sve_size =3D 0, za_size =3D 0; + int fpsimd_ofs, fr_ofs, sve_ofs =3D 0, za_ofs =3D 0, tpidr2_ofs =3D 0; + int sve_size =3D 0, za_size =3D 0, tpidr2_size =3D 0; struct target_rt_sigframe *frame; struct target_rt_frame_record *fr; abi_ulong frame_addr, return_addr; @@ -585,6 +621,8 @@ static void target_setup_frame(int usig, struct target_= sigaction *ka, sve_ofs =3D alloc_sigframe_space(sve_size, &layout); } if (cpu_isar_feature(aa64_sme, env_archcpu(env))) { + tpidr2_size =3D sizeof(struct target_tpidr2_context); + tpidr2_ofs =3D alloc_sigframe_space(tpidr2_size, &layout); /* ZA state needs saving only if it is enabled. */ if (FIELD_EX64(env->svcr, SVCR, ZA)) { za_size =3D TARGET_ZA_SIG_CONTEXT_SIZE(sme_vq(env)); @@ -644,6 +682,10 @@ static void target_setup_frame(int usig, struct target= _sigaction *ka, if (za_ofs) { target_setup_za_record((void *)frame + za_ofs, env, za_size); } + if (tpidr2_ofs) { + target_setup_tpidr2_record((void *)frame + tpidr2_ofs, + env, tpidr2_size); + } =20 /* Set up the stack frame for unwinding. */ fr =3D (void *)frame + fr_ofs; --=20 2.43.0 From nobody Sat Nov 15 07:43:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1753453465; cv=none; d=zohomail.com; s=zohoarc; b=WV3bfDWpNe6OHKzR0HopiF6aNNzOFmuvLqoMw8D+lmCt4qYz20xqeo3awLkZzvgO+5a+PUCumlj+7NliHDzFVgG5UwXd5pPiB/rf6mO8Pju/a7EU2AgzRJvz9Qwiex63f9idpvdKZm2tU72ugvakDAkwdkDEz1NWtB33ST/IRkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753453465; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=T2eBTk096GXFEkw+GcPppkxQp95yxSxNKTxwnP4oO7Y=; b=FpKulp15fCyj/Xioiu72LAgrDHS7Hc+vxEUf1D50JgV99fr4QYtsOuY5bwbjMSjuMELJGtybO8ze2uGyjnH0sDOTZCeFilsqnFCL70PGPJADE8qjiA1CuSaiVFI05kV/MlE3l/msPQrvFOuWItYg0jhx/+znFu2kOVj2T7AP7T0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1753453465038905.2734105507076; Fri, 25 Jul 2025 07:24:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufJKI-0000ul-CC; Fri, 25 Jul 2025 10:23:10 -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 1ufJJy-0000Qm-Ni for qemu-devel@nongnu.org; Fri, 25 Jul 2025 10:22:52 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufJJw-0006Sa-0N for qemu-devel@nongnu.org; Fri, 25 Jul 2025 10:22:49 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-455fdfb5d04so12472155e9.2 for ; Fri, 25 Jul 2025 07:22:47 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b778eb2bccsm67065f8f.7.2025.07.25.07.22.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jul 2025 07:22:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753453366; x=1754058166; 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=T2eBTk096GXFEkw+GcPppkxQp95yxSxNKTxwnP4oO7Y=; b=bu4Vgt/oaeSyXmOgPbxSkAi+0xPDT/bQAUam/A/m5DoCOznD/nVNbgIbC0V9IEcZCg o3nc0X7fHI3/W9byikBRG6yze9jiV4N44lK0LzM6jxAABcKshnIt1LnmmssKy7OkGNkp mUK491I55igHzuB+15FkDTAdINB/byy9miH3FdIpEmI/2/dXknUlJIQ4D+B74hBU1YZH ekji0IqzhFjffTb8nlkBwTP11RrDPVgqQsBjubl6s4YjrahiiS/Hp9Vnbgr481E/AECj kdJ02sY9ksPRR2wQSIAxNqAywMeSgsQlH5xbfghIaEbBJAMyLG5imyKeoSkNnazcrBfK LMbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753453366; x=1754058166; 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=T2eBTk096GXFEkw+GcPppkxQp95yxSxNKTxwnP4oO7Y=; b=YolVoxw55BIcDJUbA28Z2WNf+tN4m3xlfcbWCTpJx9OytaLIfuCbwE5NyhGFtjkuO5 9hqYOS6ELtqKTPs9T8Re6P4Z91o9BKsb+dT065ufshjVi6aBBnEIXiL1jZ6zGNfqm2bh Lr++W7V2Mg6t+wtjjDazt7HwE7NBSOWG8doyuZE/eehOAMYTHSH/RY963SFZxtPLInvS Jy6YXumTeJDlVWupjeZ6omSaw1907eFwtWUZgQzq5+0N4e7q7jv9RZUzo+/XYn9HgUu+ WTO3z9Dw4ubyz60LdZVE/SDYIo0ldbHdW66jfxpltm1vyyIw2PXj9NWjA3u50A3eHc1q N+4A== X-Forwarded-Encrypted: i=1; AJvYcCVeCePF7uabAsxn1SfWisE3xoECdpLZlY9ycB4oyy7rL9VQYoSxFxVcBVaOHpzLbsh+UmlwQTnPELwS@nongnu.org X-Gm-Message-State: AOJu0Yx/stk32gvK175J590GM+Oj4WJIa76+YEb7S3eeGjpfyWjHWxO5 XoD+L4h1AoJ5Da5LsO6AuxlmLCKc50YsWgxO6QNnQtC9qGYB5Rlhaa8E+EWHJPxx7iU= X-Gm-Gg: ASbGnctMVjPCVYqrnMeuAODF8CLElTlWiQ3ql9KFEfzBzI3WIDQm8wSRguGwHsHusYr Ot+julR/Gn+Odrtwz01V4TAcD0LQLAqNjHfReM0vNQVTu2JBCe8SaAtH70P4UCn9jTQavVQqqi2 l9l5xqs6yjzRbYZP9+6fk+l12hgnD9YemKXUCOOWkKpvUHcHXaIysTJZrQbvfexqPMiF33VVIMt 7wt3Omsyr7j3oh+fJuCifPPBQbSE3ygmycOiomOk8dbfgrG3oslFdVzTYAIxMzuzG9YgXitiMOg uwHzqzq3UiDeGCWOpmt9LHorcQYxJQH44awZeoGfK2tv48JFSyE2XBFpQn+YG8SmAq0KTAy5+/z dZ+TjAAsW+uPxshSWu7SHqQF/Lbr5c25K7dA7+Xo= X-Google-Smtp-Source: AGHT+IHp3pieLvso7pJYkfKAyuBH0TsE2ZQTP4tcU1UYaAc8tpAQrjDWKzRhQ6eh7+DASumN40qITw== X-Received: by 2002:a05:600c:468a:b0:456:161c:3d6f with SMTP id 5b1f17b1804b1-4587630558cmr19254605e9.11.1753453366311; Fri, 25 Jul 2025 07:22:46 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Richard Henderson , Laurent Vivier Subject: [PATCH for-10.1 3/3] linux-user/aarch64: Support ZT_MAGIC signal frame record Date: Fri, 25 Jul 2025 15:22:40 +0100 Message-ID: <20250725142240.3760452-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250725142240.3760452-1-peter.maydell@linaro.org> References: <20250725142240.3760452-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1753453467246116600 Content-Type: text/plain; charset="utf-8" FEAT_SME2 adds the ZT0 register, whose contents may need to be preserved and restored on signal handler entry and exit. This is done with a new ZT_MAGIC record. We forgot to implement support for this in our linux-user code before enabling the SME2p1 emulation, which meant that a signal handler using SME would corrupt the ZT0 register value, and code that attempted to unwind an exception from inside a signal handler would not work. Add the missing record handling. Fixes: 7b1613a1020d2942 ("target/arm: Enable FEAT_SME2p1 on -cpu max") Signed-off-by: Peter Maydell --- linux-user/aarch64/signal.c | 95 ++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-) diff --git a/linux-user/aarch64/signal.c b/linux-user/aarch64/signal.c index 9a903576add..943d63848cf 100644 --- a/linux-user/aarch64/signal.c +++ b/linux-user/aarch64/signal.c @@ -128,6 +128,23 @@ struct target_tpidr2_context { uint64_t tpidr2; }; =20 +#define TARGET_ZT_MAGIC 0x5a544e01 + +struct target_zt_context { + struct target_aarch64_ctx head; + uint16_t nregs; + uint16_t reserved[3]; + /* ZTn register data immediately follows */ +}; + +#define TARGET_ZT_SIG_REG_BYTES (512 / 8) +#define TARGET_ZT_SIG_REGS_SIZE(n) (TARGET_ZT_SIG_REG_BYTES * (n)) +#define TARGET_ZT_SIG_CONTEXT_SIZE(n) (sizeof(struct target_zt_context) + \ + TARGET_ZT_SIG_REGS_SIZE(n)) +#define TARGET_ZT_SIG_REGS_OFFSET sizeof(struct target_zt_context) +QEMU_BUILD_BUG_ON(TARGET_ZT_SIG_REG_BYTES !=3D \ + sizeof_field(CPUARMState, za_state.zt0)); + struct target_rt_sigframe { struct target_siginfo info; struct target_ucontext uc; @@ -268,6 +285,28 @@ static void target_setup_tpidr2_record(struct target_t= pidr2_context *tpidr2, __put_user(env->cp15.tpidr2_el0, &tpidr2->tpidr2); } =20 +static void target_setup_zt_record(struct target_zt_context *zt, + CPUARMState *env, int size) +{ + uint64_t *z; + + memset(zt, 0, sizeof(*zt)); + __put_user(TARGET_ZT_MAGIC, &zt->head.magic); + __put_user(size, &zt->head.size); + /* + * The record format allows for multiple ZT regs, but + * currently there is only one, ZT0. + */ + __put_user(1, &zt->nregs); + assert(size =3D=3D TARGET_ZT_SIG_CONTEXT_SIZE(1)); + + /* ZT0 is the same byte-stream format as SVE regs and ZA */ + z =3D (void *)zt + TARGET_ZT_SIG_REGS_OFFSET; + for (int i =3D 0; i < ARRAY_SIZE(env->za_state.zt0); i++) { + __put_user_e(env->za_state.zt0[i], z + i, le); + } +} + static void target_restore_general_frame(CPUARMState *env, struct target_rt_sigframe *sf) { @@ -428,6 +467,33 @@ static bool target_restore_tpidr2_record(CPUARMState *= env, return true; } =20 +static bool target_restore_zt_record(CPUARMState *env, + struct target_zt_context *zt, int siz= e, + int svcr) +{ + uint16_t nregs; + uint64_t *z; + + if (!cpu_isar_feature(aa64_sme2, env_archcpu(env))) { + return false; + } + if (!(FIELD_EX64(env->svcr, SVCR, ZA))) { + return false; + } + + __get_user(nregs, &zt->nregs); + + if (nregs !=3D 1) { + return false; + } + + z =3D (void *)zt + TARGET_ZT_SIG_REGS_OFFSET; + for (int i =3D 0; i < ARRAY_SIZE(env->za_state.zt0); i++) { + __get_user_e(env->za_state.zt0[i], z + i, le); + } + return true; +} + static int target_restore_sigframe(CPUARMState *env, struct target_rt_sigframe *sf) { @@ -436,10 +502,12 @@ static int target_restore_sigframe(CPUARMState *env, struct target_sve_context *sve =3D NULL; struct target_za_context *za =3D NULL; struct target_tpidr2_context *tpidr2 =3D NULL; + struct target_zt_context *zt =3D NULL; uint64_t extra_datap =3D 0; bool used_extra =3D false; int sve_size =3D 0; int za_size =3D 0; + int zt_size =3D 0; int svcr =3D 0; =20 target_restore_general_frame(env, sf); @@ -493,6 +561,14 @@ static int target_restore_sigframe(CPUARMState *env, tpidr2 =3D (struct target_tpidr2_context *)ctx; break; =20 + case TARGET_ZT_MAGIC: + if (zt || size !=3D TARGET_ZT_SIG_CONTEXT_SIZE(1)) { + goto err; + } + zt =3D (struct target_zt_context *)ctx; + zt_size =3D size; + break; + case TARGET_EXTRA_MAGIC: if (extra || size !=3D sizeof(struct target_extra_context)) { goto err; @@ -533,6 +609,13 @@ static int target_restore_sigframe(CPUARMState *env, if (tpidr2 && !target_restore_tpidr2_record(env, tpidr2)) { goto err; } + /* + * NB that we must restore ZT after ZA so the check that there's + * no ZT record if SVCR.ZA is 0 gets the right value of SVCR. + */ + if (zt && !target_restore_zt_record(env, zt, zt_size, svcr)) { + goto err; + } if (env->svcr !=3D svcr) { env->svcr =3D svcr; arm_rebuild_hflags(env); @@ -605,7 +688,8 @@ static void target_setup_frame(int usig, struct target_= sigaction *ka, uc.tuc_mcontext.__reserved), }; int fpsimd_ofs, fr_ofs, sve_ofs =3D 0, za_ofs =3D 0, tpidr2_ofs =3D 0; - int sve_size =3D 0, za_size =3D 0, tpidr2_size =3D 0; + int zt_ofs =3D 0; + int sve_size =3D 0, za_size =3D 0, tpidr2_size =3D 0, zt_size =3D 0; struct target_rt_sigframe *frame; struct target_rt_frame_record *fr; abi_ulong frame_addr, return_addr; @@ -631,6 +715,12 @@ static void target_setup_frame(int usig, struct target= _sigaction *ka, } za_ofs =3D alloc_sigframe_space(za_size, &layout); } + if (cpu_isar_feature(aa64_sme2, env_archcpu(env)) && + FIELD_EX64(env->svcr, SVCR, ZA)) { + /* If SME ZA storage is enabled, we must also save SME2 ZT0 */ + zt_size =3D TARGET_ZT_SIG_CONTEXT_SIZE(1); + zt_ofs =3D alloc_sigframe_space(zt_size, &layout); + } =20 if (layout.extra_ofs) { /* Reserve space for the extra end marker. The standard end marker @@ -686,6 +776,9 @@ static void target_setup_frame(int usig, struct target_= sigaction *ka, target_setup_tpidr2_record((void *)frame + tpidr2_ofs, env, tpidr2_size); } + if (zt_ofs) { + target_setup_zt_record((void *)frame + zt_ofs, env, zt_size); + } =20 /* Set up the stack frame for unwinding. */ fr =3D (void *)frame + fr_ofs; --=20 2.43.0