From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.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 DB29D3F482A for ; Thu, 18 Jun 2026 12:16:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781785020; cv=none; b=m2FNA3TzT+LNrZoWmtm0+2TTZpjXdGW96p73boJJ1gaKboompbOvW4rWaLYNpYyLnTBx8UA4vReDoYNxijPSLs4qbl5qQ1tRbh26ZoCyF+vEzsPB4cYYkSB+vCL7iRJ1Krxkd5r1WANRhlIHiorysaSONPsEj1PnjEvTEuGfE58= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781785020; c=relaxed/simple; bh=gGkWocGEAP/CjIdO62aKSEdoOplcwhb3SX3ymAiG8yM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Y3idMpQpILbF8eqRWu17wUalBW8wP2sQBc2Upu9Ejjf4VQuWpfmqvI6/buHgYBKk+BGvw9mkeewko+vY4ZIuzWdVTTNPeIS78oHVuKMteQAmYThluku04+vmk1GhL7qMKg4I8h9al9amGFUPY3qZPyJfa6qvpXmUD4e4Gr8Snf4= 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=UvRzj9Jx; arc=none smtp.client-ip=209.85.218.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="UvRzj9Jx" Received: by mail-ej1-f74.google.com with SMTP id a640c23a62f3a-bdad545342aso96581666b.0 for ; Thu, 18 Jun 2026 05:16:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781785012; x=1782389812; 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=C9HlvrniU1D96ODxhGlOnHZdC3XvdXiJYKZBpcs/wmo=; b=UvRzj9JxvY8E13f8TW4Dmy6VU0aQv1fAcr7cS76FdjeNRF/Fjhf4Iv1FvaYK6ZlCoE sMLT6AnjbIvoFRcMAYwv9ClTzlPuZUVoBKvn3mwOEOnOmwnlEvxqfHSLs0pyat2awZSz 91UDb2gz1x3OzaHsdxkYNAFmHMRv8vJ0nHQW0z64Ni27FWRtbXLmiY4MHpKlWUlFgw4G fvdmdEV1XzD2IevcqxyPB/WBw2YIrxkHefeVhfRdgD4/Ynu2gAvRZ9a87yYM2+JtnD3t d8uR7G8pWYfTjVBBdAO8dT70Od0IfZeeDH3MD0Pj95XF1Js8IhT97ZyECYJkq63XccG1 Ablg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781785012; x=1782389812; 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=C9HlvrniU1D96ODxhGlOnHZdC3XvdXiJYKZBpcs/wmo=; b=rLwye8mHpV17vkAVXugsb0NYRCxP7CxzM08X8SwsMIxGpbWugp8Oo9wTmYmZP7Mfbk ZuhZNstG/Q0/u5M4JrzMsfV4q45mKPaj2unvywWBdPtBDB8CKS7Op6qsujKXZacP61+e 1wP5wxlOY8E33szIuHCQDTGm8tJIJq91KOR2DAsiCYCz+rV7YGjbTq0dBik4PouQ4PZk bBWUfj6zLeg9G6zSf4QGDIe3xkrtN2n7wbrWk8QchQRN1fm/yG0dSzy5+Wlrf40whMRC o9hbndeUwTqu9DYCrJF1/8nIuXqM4+iSNPnNhfCOTi3EsCYaJ+zmiEWumwCFp7UcFQAf M3bg== X-Forwarded-Encrypted: i=1; AFNElJ9PL/Lz92R6wkn31LoVFBojc0fszmHSLHWgWEKjzCjMp0e212DlojUT7PlHoM5elRfZ8XaKRvJ8bo7sYMA=@vger.kernel.org X-Gm-Message-State: AOJu0YzcGHg3JMvmq95mkdEXOyXzLlDQv/n4MBKXKE3if9rO5Uoe3Nu1 cN5RXvI2E2by4+Zj0xwB0n1dst0ShOnI+Etqli6k4KwTFTDEZay/S38HE/YbNmmjWLqHXqDowCr kFg== X-Received: from ejnz1.prod.google.com ([2002:a17:906:65c1:b0:beb:941b:68f1]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:70e:b0:bea:a8c2:3d02 with SMTP id a640c23a62f3a-c074ac8784cmr188483966b.4.1781785011825; Thu, 18 Jun 2026 05:16:51 -0700 (PDT) Date: Thu, 18 Jun 2026 13:16:42 +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-7-tabba@google.com> Subject: [PATCH v2 6/7] KVM: arm64: Set IL for nested SError injection 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" kvm_inject_nested_serror() constructs an SError syndrome without IL. The architecture mandates IL=1 for SError unconditionally. Fixes: 77ee70a07357 ("KVM: arm64: nv: Honor SError exception routing / masking") 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 b74369e9ad7f..6f12496cae81 100644 --- a/arch/arm64/kvm/emulate-nested.c +++ b/arch/arm64/kvm/emulate-nested.c @@ -2938,6 +2938,6 @@ int kvm_inject_nested_serror(struct kvm_vcpu *vcpu, u64 esr) * vSError injection. Manually populate EC for an emulated SError * exception. */ - esr |= FIELD_PREP(ESR_ELx_EC_MASK, ESR_ELx_EC_SERROR); + esr |= FIELD_PREP(ESR_ELx_EC_MASK, ESR_ELx_EC_SERROR) | ESR_ELx_IL; return kvm_inject_nested(vcpu, esr, except_type_serror); } -- 2.54.0.1189.g8c84645362-goog