From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63C4437CD5A for ; Mon, 15 Jun 2026 13:11:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781529080; cv=none; b=bXTyxPIqvVb0Ftyy9lutbEYmY4SsrzJ3C2k4c4F3UmiroTIMf3tCQ3Cv2laSSi/21TinP5NgS5YcitjJ1ejmpKmnh+E8XUlGQGcVHB7NlKd+wI/eWTDp83Z4wFsnpwY6YIYSOF4V2C5zHkV5u7mstkOFAsWOLXMSxCLXQZScljw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781529080; c=relaxed/simple; bh=Q8TEX85KOjNcdvNCgZVyXSGWbrrAjZBHAj9OERtFzQA=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=rdiTfSSaAt/Ydrk93rWtLNzFRp3YKSw3rVZG5yTHRl75Rcu/8f7caW819OZhGvfvidtD1htQt9rDxZXpEVJ2pjui74UQW1+ZQDlsBkYxXNuk19QhGcGfugGrGY9mG1Sd8m00IFiFTJbWcFEpb6ZM4l5iJMu3IvB2g4MaIYgmvDc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Y7drgmZb; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Y7drgmZb" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-490ae016853so24652585e9.2 for ; Mon, 15 Jun 2026 06:11:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781529078; x=1782133878; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=M73130SiNKp2+ndBAl5SeIBo8s7L0rXyQ0BMD/dcV4o=; b=Y7drgmZbpinhVBMKtgoFFfYz4Ut9WTDcdDikQi26N/HLhy9tXVBxY+QR8bq8rzIrwT I7EZBYFVQRD6fDKy5Eb7vxsPxnrR68UZ/bIk5vppXAG3kY1PVFwmcWz+G4/7P9aOFv5C lP00HfroJnJtTQZbQPHaEj3SI2CHPk8/uIoqYkzKRA/bZgNM1rVX3x1jhxL4Q67fNuhJ CQXRHy2Cn/YOucb7ro4VjfclDuAji1gdXXZPGEQQSDi9owvhqlFEz22pQOnPB6WK9PKZ qMoHBJdyjgqPFrUhDKs/EWmfZlOvYBX20T55EvSmNg6125ozP66V7KLX0syKeIb7DuHq 0Frw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781529078; x=1782133878; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=M73130SiNKp2+ndBAl5SeIBo8s7L0rXyQ0BMD/dcV4o=; b=dw3kpXJkS6j4CJm5PuFh7rZetBNXkLNDyRlffIu3KG8kzVbm8NsASGLcL/QncG8Y4D 3D//DU+/bRxeLTJbza692uLPbjXvX4QiSBQxQ6UkUBVCW6xmRGpWKa9ZlRZOrWiWUDOz /McNzGmQrIIsohLfCo1Q2IcJL3Znwf5FtkMIUnqu52TSnsas+XeWlP8FFAsKKPcIHiIS 9dF1zvLUfK7hAo7PUwgE5DBd8Tkqcvl7MsJThmHUvj7dOW/cLDOp6OGok8GIIZoX0Pth EobsiwvaEC85id54yT+p/I0DGaLKcrQd3Ns7SnTY1/SROEVtYeB5Gdj4CGT8acFvg3Po YL4w== X-Forwarded-Encrypted: i=1; AFNElJ9RcLc7KNHzE8H2tJ3bjf6Tfl1vvs1UzIeW75KltAzQjXxz7oap8T2NIl+QunXJDTS4gASfp8a80YEqYMw=@vger.kernel.org X-Gm-Message-State: AOJu0Yzuc2a1We7akwgFKHjoLiBP/HLiBjZneV1xIhTMqS7MMyfLqRrn nNNbSdsjJW4+nBqy5gZ6QOuv0kpzcYYfpuC4v7ET21lseTQeGECfdh2127yUypUKstIyZBAH51T dYw== X-Received: from wmph20.prod.google.com ([2002:a05:600c:4994:b0:490:bd79:13cd]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8b5b:b0:492:25a1:e2f9 with SMTP id 5b1f17b1804b1-49225a1e350mr103728295e9.26.1781529077262; Mon, 15 Jun 2026 06:11:17 -0700 (PDT) Date: Mon, 15 Jun 2026 14:11:16 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260615131116.390977-1-tabba@google.com> Subject: [PATCH] KVM: arm64: nv: Write ESR_EL2 for injected nested SError exceptions From: Fuad Tabba To: Marc Zyngier , Oliver Upton , Catalin Marinas , Will Deacon Cc: Joey Gouly , Suzuki K Poulose , Zenghui Yu , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, tabba@google.com Content-Type: text/plain; charset="UTF-8" kvm_inject_el2_exception() writes ESR_EL2 for synchronous exceptions but not for SError. enter_exception64() does not write ESR_ELx for any exception type, so the constructed syndrome is dropped. A guest L2 hypervisor taking a nested SError observes stale ESR_EL2. This affects both kvm_inject_nested_serror() and the EASE path in kvm_inject_nested_sea(). Write ESR_EL2 for except_type_serror, matching except_type_sync. Fixes: 77ee70a07357 ("KVM: arm64: nv: Honor SError exception routing / masking") Reported-by: sashiko Signed-off-by: Fuad Tabba --- arch/arm64/kvm/emulate-nested.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kvm/emulate-nested.c b/arch/arm64/kvm/emulate-nested.c index 22d497554c94..c2580d40197e 100644 --- a/arch/arm64/kvm/emulate-nested.c +++ b/arch/arm64/kvm/emulate-nested.c @@ -2750,6 +2750,7 @@ static void kvm_inject_el2_exception(struct kvm_vcpu *vcpu, u64 esr_el2, break; case except_type_serror: kvm_pend_exception(vcpu, EXCEPT_AA64_EL2_SERR); + vcpu_write_sys_reg(vcpu, esr_el2, ESR_EL2); break; default: WARN_ONCE(1, "Unsupported EL2 exception injection %d\n", type); -- 2.54.0.1136.gdb2ca164c4-goog