From nobody Fri Nov 14 23:28:52 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=1759961434; cv=none; d=zohomail.com; s=zohoarc; b=NRfu7x5cheF2Fed1Tgj9x2vJ1ZVJZKqmWxnWif5S+62LyMLUAfjPldPooei+vORduMaIStJri4OZsx7xe7syWPi4oaufIR7GIDMHzH7OCynU3pWVg1uiX1ZjR5wqveanbsD3EtzoartE1A2MZv25fUhlOHhEpbfmu+EkfgBQAz0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759961434; 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=TIGC+NB44/a0H+dR2upS+UgyhxrsXnOzX4fio5wssx8=; b=J+ygWeZ/BkyxqXWyi0zwKMaMCLnmztolKbipLFA8GNxKLVBlXyDSUZVu1WwrzQS3xnHh+XA93J9p6Etr2sP8FLGpQwj/cUvirL0Tmnl3MmUBcdIDNu0ENjIC3UoebvLbiVqHJ7eotCALQPI92VkrWW9K7AufgXO7fSzLhUVEL+s= 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 1759961434086537.6500822579986; Wed, 8 Oct 2025 15:10:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v6cEi-0002BM-Ls; Wed, 08 Oct 2025 18:02:18 -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 1v6cDL-0001Ku-Ol for qemu-devel@nongnu.org; Wed, 08 Oct 2025 18:00:55 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v6cCV-0007PP-Uu for qemu-devel@nongnu.org; Wed, 08 Oct 2025 18:00:49 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-781001e3846so286293b3a.2 for ; Wed, 08 Oct 2025 14:59:57 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-794e1fc9db6sm740724b3a.66.2025.10.08.14.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Oct 2025 14:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759960795; x=1760565595; 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=TIGC+NB44/a0H+dR2upS+UgyhxrsXnOzX4fio5wssx8=; b=YfNIqPRlSHEp61Z+AMEmIudgV46zG6PRtl1DC4rteT497ACnLH7Gz95vIzVeh3J9c0 KwobHRuRfbhRgKdhxOIGfZWAXbpn1xq+1SjajSiStH0tQ5W7obqlwH5Q+ELErIsPkPLq dATKPV2Ifzm1cUDgtadEosOsLINW8z82Mz++w6g9qO4TzE3sLUMzJN09ZnWumSN4IbPX 403OnfX9KC6G1LaqMBF8WDbUMIb/yrA7TQS3lCUECYUVzK/p8KxwhnQPKyPcXuVm+5qv gzksPA33bJkFX7WDZ975elnanCK1t/ST1G4IvPMAl+a1l582mzFq1O3JMpNanTIIC/GD sr8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759960795; x=1760565595; 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=TIGC+NB44/a0H+dR2upS+UgyhxrsXnOzX4fio5wssx8=; b=cDR0PymANmkTrCoXf+B8sbIcFHB804D5+JSdRvCt0MhMTLruG5SAVj0TiKQ57evu2A y7JyV7NvhOj1vDaLWQdtQaiiYwGoCynxwsFgsevJH8wdYW56YLdSgrc4I4LhBKx5tpPW pZsiT0F8zO6h2raR0IgIAbKjyLRHWKQ/Wpy44vXk0nl94R3AqHfmPwMGu8RHgMRrPUPU MLJoAgD5dlTvbtQkC1qCowFTnbo42f+fvaS6TwkddPhE0oRzYGtA8WeW/kD9CXB3PU6q g87sUVQ8oZ43bWg2CWZd+DQOwC7XBV5UwrDEfdLtSPGcONRb/40K/BeRy+5tzfMcEYWG i2JA== X-Gm-Message-State: AOJu0YwGsE2MPbV8lZIU2VfhmJEorrTvpruOP+tEnXk0ov4YGUhYCVjB E0KF/IiFRoQVvPnxUyCeQnYsJI5JiG6Bcp2tJxENHbAKafSmzjADY4Nb544nAlEC9q3r4GMQTDy fxvpQjBo= X-Gm-Gg: ASbGncs56fD1SOjgmGesmNvHNXMg6NZZULKUmxOph2+PjHefdgTf2cSbn1yHOXpdgpn EblR7SF/cph5INzDjckTyY4aGlQzGJZi7/saqwhhAwq25W7BJgIDjF84rit0WA5YwsBn/+gbyLE fy2LBfIqmxcvY5Nr5cIYLBjdoybyWxlTW1dra5UPNCxWu2FArcIhp9yQsBE5gWaUgcpRER7OZFO Ul3yQg0L0NjpElQU/1NVoN1JE8wTKzQd9RABR2xZ8m5GznlVLP7DKBVEN6NKi/9KlLaFTly5Y2H WEM8oOM0Kr1UoVoIOLHDpf1RZOBEgVxii7s5Q0UIB8exG6wRJYFhcHka89ErA7zOTYLIgyM116a 8Ea6DG0A9v/L2iXwHpimuvyHwOoRhN+/PuVdP7QM1Xqx1Ae78SVJ0LJTd X-Google-Smtp-Source: AGHT+IHe7wnLO5tL0J9y3n18M3NhsgUh0CCuOalgyyaqyXn3RTbbmnRdJNPB258VXxC5Cv7qAdVsiA== X-Received: by 2002:a05:6a00:8d5:b0:793:1b79:ee61 with SMTP id d2e1a72fcca58-79387434292mr5599572b3a.22.1759960794532; Wed, 08 Oct 2025 14:59:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v7 61/73] target/arm: Implement EXLOCK check during exception return Date: Wed, 8 Oct 2025 14:56:01 -0700 Message-ID: <20251008215613.300150-62-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251008215613.300150-1-richard.henderson@linaro.org> References: <20251008215613.300150-1-richard.henderson@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=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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: 1759961436076116600 Content-Type: text/plain; charset="utf-8" Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/tcg/helper-a64.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 08b7db7c46..ba1d775d81 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -675,6 +675,17 @@ void HELPER(exception_return)(CPUARMState *env, uint64= _t new_pc) goto illegal_return; } =20 + /* + * If GetCurrentEXLOCKEN, the exception return path must use GCSPOPCX, + * which will set PSTATE.EXLOCK. We need not explicitly check FEAT_GC= S, + * because GCSCR_ELx cannot be set without it. + */ + if (new_el =3D=3D cur_el && + (env->cp15.gcscr_el[cur_el] & GCSCR_EXLOCKEN) && + !(env->pstate & PSTATE_EXLOCK)) { + goto illegal_return; + } + bql_lock(); arm_call_pre_el_change_hook(cpu); bql_unlock(); --=20 2.43.0