From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06E8344F57F; Wed, 30 Sep 2026 17:23:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790789015; cv=none; b=J2zLji799WiKXuTiVebeIkC6eV1BkXhIn4DgfzFPoT3x6CVYcYDXKZdAeFLNlXavRIbK0AEcqqJKV19j9u38OdepVJ2YWDtGjcsykuqm2VjxdqpZW5C5X8SBl9TVk5ks2CPA45J/pNWSOa4WdmcVSvvF7ldz6cTpsvZ/bg+oy6k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790789015; c=relaxed/simple; bh=WTbWeHFOxAskSRNyMrz8U9SAUHlWMZS+oeQ6WADNtDg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OFTlGf1K78WvNidcLJijb4yMqhR09lFLU8NtBCIDj/iF+XyjJKKORxM3WjVDtv/Y91cCpzMUvtKXPBt5mqAzGa5Oacp4kWYHDRKSMF5zKMy2eJcRj/1E4bHeb01pZ0IMW6GjCubW+knztatlhccZkLPQcDNgGeqYpCwfABB8E6Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vz07LzFa; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vz07LzFa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 631881F000FF; Wed, 30 Sep 2026 17:23:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790789013; bh=uzg/562+ugsubSk4P+WvXkaPI91Ugy9dBLcuHdGRjfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vz07LzFamqJt49Tb5ZDU/oh9dLaP/lehVyf5XYtS20yY6uNcfdT/hfAEE2gPNI+BX LAL5JI1QZ/71krgoutqDM9Uc8LWbIHoFMCvI0neETj6c7y+Inbym2PGM3A0jmPkvcT JcRo6U+cICs6R7OCRJ7BHXKUw89rdLhBDdzwOEho= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Leonardo Bras , Mark Brown , "Lorenzo Stoakes (ARM)" , Oliver Upton , Sasha Levin Subject: [PATCH 6.12 328/877] KVM: arm64: Fix FGT mapping for HFGITR_EL2.nGCSEPP Date: Wed, 30 Sep 2026 17:20:39 +0200 Message-ID: <20260930152421.760903975@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152414.738996857@linuxfoundation.org> References: <20260930152414.738996857@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mark Brown [ Upstream commit 089e4f3c4862ba3f29dff2361caa8084879194fd ] The encoding to trap mapping currently maps a FGT on OP_GCSPOPX to HFGITR_EL2.nGCSEPP but as per DDI0601 2026-06 this FGT controls trapping of GCSPUSHX and GCSPOPCX, and not the separate GCSPOPX instruction. Update the mapping to reflect the architecture. Fixes: 863ac38984a82 ("KVM: arm64: Add missing HFGITR_EL2 FGT entries to nested virt") Reviewed-by: Leonardo Bras Signed-off-by: Mark Brown Reviewed-by: Lorenzo Stoakes (ARM) Link: https://patch.msgid.link/20260901-arm64-gcs-v20-2-f31750bdfadb@kernel.org Signed-off-by: Oliver Upton Signed-off-by: Sasha Levin --- arch/arm64/kvm/emulate-nested.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/emulate-nested.c b/arch/arm64/kvm/emulate-nested.c index 05b6435d02a97..364beb6f27a1d 100644 --- a/arch/arm64/kvm/emulate-nested.c +++ b/arch/arm64/kvm/emulate-nested.c @@ -1287,7 +1287,7 @@ static const struct encoding_to_trap_config encoding_to_fgt[] __initconst = { SR_FGT(OP_AT_S1E1A, HFGITR, ATS1E1A, 1), SR_FGT(OP_COSP_RCTX, HFGITR, COSPRCTX, 1), SR_FGT(OP_GCSPUSHX, HFGITR, nGCSEPP, 0), - SR_FGT(OP_GCSPOPX, HFGITR, nGCSEPP, 0), + SR_FGT(OP_GCSPOPCX, HFGITR, nGCSEPP, 0), SR_FGT(OP_GCSPUSHM, HFGITR, nGCSPUSHM_EL1, 0), SR_FGT(OP_BRB_IALL, HFGITR, nBRBIALL, 0), SR_FGT(OP_BRB_INJ, HFGITR, nBRBINJ, 0), -- 2.53.0