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 75A6739A056 for ; Thu, 18 Jun 2026 12:16:51 +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=1781785015; cv=none; b=Mm1kVyykW6F0tNBeUW7lmprAwNJzYH7ni/tfwgwrzYG93q99/xxxSJzBDvYInwa9bZsyuGHVrND7Lzga0FNyWkcgwcEsltxPkMfKJ+HHSoHumPFYEYEKvQXd+lueiofVw4ZV7onM2A2s26hucpeSfy6l+ESFWXV81Ud4cxkUAqU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781785015; c=relaxed/simple; bh=j3rEYP7FiUuGbQ4RpO2XU0IDDF9AfVNcqI5J1SlJhcI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uXFJyPKgpF6vagjcF5wtJ4jdjZMMy/RvU2XmqFupLVyvVnU8aSoBnlfus1Vjwm6CgYAk/TWA0+kBDvDHMZUDeRvNhvAf2DU87Z2hf7uJA8WEXyLC/ezUFJTC1mZrOl+Slz/SHsi/oV0a/mm51cPkuXY054JRo/haAV5+H+lZugY= 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=Wg/3nek0; 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="Wg/3nek0" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-490d3f03883so6246065e9.1 for ; Thu, 18 Jun 2026 05:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781785010; x=1782389810; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=GSfLIh1ia8h00/76vM0zOwIn9wq6bVKngqqirdlDuHs=; b=Wg/3nek0ALoBEiun/A2jYsWS+Nh6DWPzlUazfUeMqa+x42VsZRNYphKQon31+0XH8j b3hCcGC5P6EzH3UNWSPwKa4KWy8pxF3qoG/lpxuPPeLvVR8Tw9UK6taMLVMn/Z4LNQJQ 1UuRZmJcCoXgoXm9BYXJrDqH1x52Wi+bCvPaVUspBDhtas5EUsSpZU4G+5jdFW3x7OOi g8/K72DLeo4Qj9twwQkj4gnlsc/FtCtv4BvcHSjMp95DaD4G3diEvgwD9FC2d/5wqvlk ytVLvCq8n5rg67sIZQf2WqhWWCOMzUMGGCRRNQr8yMUtkHsBrF/mIF7MT76KqGCDjlXn 7d4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781785010; x=1782389810; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GSfLIh1ia8h00/76vM0zOwIn9wq6bVKngqqirdlDuHs=; b=fSvBJdPNHER+IZnsHUTcsg3ihu6OCQGX+uN6zz1D9YnsgYva6mqPIHzpd9BB0xnKpL YjnJuTyhf+Xo+X7p0wVV4xYXrFg9xJWOQJ4ngrRyW83mbnD3l+hft6pCTAVPN+PzTEYR p191UCYgTieuYqWs5i21zvGnc797vVtJ4B5e7EDoX1u1ZdWaUrDlIDWJ63Nzjy0RBI82 mRsuaBwT5RBB4qpRLX+Q0eNoAkqAu01346YRBlsA3bVsUY1VbzAgMVLSSLfsCNjsJdRF TLUsDBLGwRqftAqXIS/OtKRtVyGha9LXDYubgFt+25AhiVWoWqOimAw66MBjM2vi+tkf IxVg== X-Forwarded-Encrypted: i=1; AFNElJ+ceKtSmdRv74tO682ydI/iGOloi4U3v3YgeAWhxkSILxZrMDk3gOtjg2f5ec6k1bqTKssQt92u+a9Xw28=@vger.kernel.org X-Gm-Message-State: AOJu0YwykoAqpnThGxv1H5c29Kinot8kRvEDJ8TPMg4udNP7IoId2r6G V+rMfNWQM5ZoNcCUtsJ2FhFphwk4Lq4A44CTIqqE55o1YW2wGY6ZgTJX0hMXQreHMhnX6HDfrUV 6ug== X-Received: from wmbjl3.prod.google.com ([2002:a05:600c:6a83:b0:490:46a4:b11e]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1e0f:b0:490:e5c1:b88d with SMTP id 5b1f17b1804b1-492333babfbmr148040435e9.1.1781785009399; Thu, 18 Jun 2026 05:16:49 -0700 (PDT) Date: Thu, 18 Jun 2026 13:16:40 +0100 In-Reply-To: <20260618121643.4105064-1-tabba@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260618121643.4105064-1-tabba@google.com> X-Mailer: git-send-email 2.54.0.1189.g8c84645362-goog Message-ID: <20260618121643.4105064-5-tabba@google.com> Subject: [PATCH v2 4/7] KVM: arm64: Set IL for injected FPAC exceptions during ERET emulation From: Fuad Tabba To: Marc Zyngier , Oliver Upton , Catalin Marinas , Will Deacon , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Joey Gouly , Steffen Eiden , Suzuki K Poulose , Zenghui Yu , Vincent Donnefort , Sascha Bischoff , tabba@google.com Content-Type: text/plain; charset="UTF-8" The FPAC syndrome constructed during nested ERET emulation does not set IL. For FPAC (EC=0x1C), IL reflects the instruction length. ERET and its authenticated variants are always A64 32-bit instructions, so IL must be 1. Fixes: 213b3d1ea161 ("KVM: arm64: nv: Handle ERETA[AB] instructions") Suggested-by: Marc Zyngier Signed-off-by: Fuad Tabba --- 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 dba7ced74ca5..b74369e9ad7f 100644 --- a/arch/arm64/kvm/emulate-nested.c +++ b/arch/arm64/kvm/emulate-nested.c @@ -2776,7 +2776,7 @@ void kvm_emulate_nested_eret(struct kvm_vcpu *vcpu) * ERET handling, and the guest will have a little surprise. */ if (kvm_has_pauth(vcpu->kvm, FPACCOMBINE) && !(spsr & PSR_IL_BIT)) { - esr &= ESR_ELx_ERET_ISS_ERETA; + esr &= (ESR_ELx_ERET_ISS_ERETA | ESR_ELx_IL); esr |= FIELD_PREP(ESR_ELx_EC_MASK, ESR_ELx_EC_FPAC); kvm_inject_nested_sync(vcpu, esr); return; -- 2.54.0.1189.g8c84645362-goog