From patchwork Wed Feb 2 12:23:53 2022 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: 539324 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp1521361imr; Wed, 2 Feb 2022 04:27:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3Tr6miSk2dTJZtbQwal1lTOsnhFgspWjGHdzRmYwzAg7VI0yF3tqwPT+5HJayTfOlxJwU X-Received: by 2002:a25:dd83:: with SMTP id u125mr39739057ybg.490.1643804858980; Wed, 02 Feb 2022 04:27:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643804858; cv=none; d=google.com; s=arc-20160816; b=Yztd748aMlUZ0SemFjJS99jZoH31CFsg/PqKX02BrfkX3I94o6D2S98o//aa3WBywm iGetIjkpGAzrFQWzE11mz+Kj9QR9/jeKJ2Mo2+AoHTybrHfXGU/k3UTorHavwopPMYMK 9dpN89qcOAo/7TFj996vmB49R8Z+tuDiv0mgMgy+WjMihwMT0KvqqfPw5t9FpAU3H975 XnkUOfKRC/thYcUN+u2J0Z8rvm5KC9A4Den5nQ4B+fGycvsEpyjtZPqi6a8gG4sVKPk1 eZn5YXaQTgzNyxBA9m7QHXNV9WwN/+BTBOgOIhrNCqPm+G1hyxOMovBdSxCFToIQi+D+ fxHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=Q1jDgGGFL61TNvgJOMQxLBBqM4ZBwKGs/UpbUKMA6sY=; b=D88pmI76z6hVTip70l33yUEezqfYtReHe+hv0QSf2cz0ydnomGYTpaZk83eKmc70r1 yUkI0eyo+rCpXoulwvBB/wvn75w6/YG4FMa2DzbTbXfgv81HrP0QL1ZPfcpXe5kzQ7Pq 4fReCdmLuUKRQ4laGnV1WsDkHSgMwZSBUpJKbjpnaSJC31aQeUozH3jD9j/SVjaNvTQJ pZoUEeflh6blzCdmT4MyOJZU36I+Ezx++r14FRD1r0fi6TqekmipiB5dUw93ok5hZgU8 Aypffl1pK5CYEm9Orocpz/oovMBUM0pqGXRHfMKt8BV8Zob5SUlQsgjyarBXCr8+E5Hu 56UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=npV9gCfe; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 80si263914ywj.347.2022.02.02.04.27.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 Feb 2022 04:27:38 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=npV9gCfe; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFEja-00035c-AI for patch@linaro.org; Wed, 02 Feb 2022 07:27:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFEgD-0002rp-IN for qemu-devel@nongnu.org; Wed, 02 Feb 2022 07:24:10 -0500 Received: from [2a00:1450:4864:20::435] (port=38673 helo=mail-wr1-x435.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFEgB-0004BZ-Pf for qemu-devel@nongnu.org; Wed, 02 Feb 2022 07:24:09 -0500 Received: by mail-wr1-x435.google.com with SMTP id h7so6247764wrc.5 for ; Wed, 02 Feb 2022 04:24:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Q1jDgGGFL61TNvgJOMQxLBBqM4ZBwKGs/UpbUKMA6sY=; b=npV9gCfeZqN8CZmjmMO9V1v90PwB6KeVOzGDCuU3yzozKf6lrL7oNvBohiuCx3I4s8 oRg/2GWfjFP65WypMU4pUeIxddirOh5159VwPef4BCDepmWOjj754zUNfdygquW957z7 6EqoLhxp3AWr0Iluvj86Z06+epg6FXusjzlTmJM3G8e2KpYKEmfU+wuFnEK/jhmetHFf hpGIhiFQ4iC0eLPJK8seUnFBbbWe+psSZwNAxKlIVR+et/PVPGgPWlX9Nv6btL+tWExZ Hy+GO4pN5ZVFHpdq4QM17hBOVPYJJ27HcjNKNuO86tb4W4k+kVyUZhJNtZds2FHQCtdJ lk8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Q1jDgGGFL61TNvgJOMQxLBBqM4ZBwKGs/UpbUKMA6sY=; b=Vpg9GJHogMaowJfblDIZu6BaESTMKHJo9iyG0ymY0ncsSypLlBwS8bQaQ2AZcGIfG6 4/TKgZXcSi8uf2ePMktb9X1nbHpoNSQPOYxlWFqkVELgEInWAAi8p/S1opbcPhWUBClo JnJj1OCI1t9Wu/4IddmMtzc0quboVvD4ifmHPXnpLOtu2DJsLoiYCbjUPqAD2U4dLRJY kRhJH3DGtQ7kYnwq0XvUBh9cVGGNa2sfk8zZr4rNtj1k/ChAKAuabE2cFWPLogTmKwLR jUzalbZhHvcodZHTDl1A1wW4qpam2ZPSLKDGRhiPwGxLYnfYGpHIBl/NQdJcKD2m9Aox 1bNg== X-Gm-Message-State: AOAM531DStO2PxskQzlP4W9FdLsnxQAkZKLUu3or/B1Aiq5Ey31aoiq4 6ke+vuTvhulVKTGUCIAx9704Ig== X-Received: by 2002:a5d:5052:: with SMTP id h18mr26686408wrt.350.1643804644915; Wed, 02 Feb 2022 04:24:04 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x6sm20225761wrn.18.2022.02.02.04.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 04:24:03 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 19EE41FFB7; Wed, 2 Feb 2022 12:24:03 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [RFC PATCH] arm: force flag recalculation when messing with DAIF Date: Wed, 2 Feb 2022 12:23:53 +0000 Message-Id: <20220202122353.457084-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::435 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Richard Henderson , Andrew Jones , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The recently introduced debug tests in kvm-unit-tests exposed an error in our handling of singlestep cause by stale hflags. This is caught by --enable-debug-tcg when running the tests. Signed-off-by: Alex Bennée Cc: Richard Henderson Cc: Andrew Jones Tested-by: Andrew Jones Reviewed-by: Richard Henderson --- target/arm/helper-a64.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index d6a6fd73d9..7cf953b1e6 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -83,12 +83,14 @@ void HELPER(msr_i_daifset)(CPUARMState *env, uint32_t imm) { daif_check(env, 0x1e, imm, GETPC()); env->daif |= (imm << 6) & PSTATE_DAIF; + arm_rebuild_hflags(env); } void HELPER(msr_i_daifclear)(CPUARMState *env, uint32_t imm) { daif_check(env, 0x1f, imm, GETPC()); env->daif &= ~((imm << 6) & PSTATE_DAIF); + arm_rebuild_hflags(env); } /* Convert a softfloat float_relation_ (as returned by