From nobody Mon Apr 6 16:47:30 2026 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 4FC83366577 for ; Wed, 18 Mar 2026 19:02:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773860533; cv=none; b=D3uX3zC8s7fw1ST1s0JdanEbQfMVEix4zwhvXBa42w5enLO/ayreN9CedNuz2SA8mMwg0VacpZ7rGeA2SuSInX+x+5YblyONuTZbtMf3t+67hsb1LbkCl0Rxz6izWzd2mhZCygtP0/9aa+JByUrgiJSn0QIWnKyIkdR3ojoUpHo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773860533; c=relaxed/simple; bh=z+2sf/5km6HTWQdHuHjaRmn83kq0xn9ypsPl2UqNUbg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=uvqsGOxQSWvsxHKvn4iwEt5LIun+fhqLdRf2jZdBje3IqPihRvmKxRwAeCDHf8f/WfLZiwnrJnqPD9TKU1bJfaR3KPgq9tsUb/OfF3g842caukYUw2HB1LmMwBmQe9VEl2QD6DXNdr8SM0DThiM8NqPIVCKRwR+HXhggqSMYVDU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=gIPaBGBj; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="gIPaBGBj" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4852e9ca034so1337315e9.2 for ; Wed, 18 Mar 2026 12:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773860531; x=1774465331; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4pIf+VLPRohGstCaliNQzf45fwV/wxcML8JuOKn3Xfg=; b=gIPaBGBjiuOmg8wjnpikbLqaU9OSDaMr9/0YUGjUIBjMuKSeu4Znzx03u9EVBRxTgx bP45HH7H9/FC8ZkYDVoO+jKggPig2G2BP4+uJ3IMKOFLo7sryMk1LAS310ZxokWn/l57 p3MlmhO+OqYTvFqy0vXTcvW1aIjpzvsM+zeTE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773860531; x=1774465331; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4pIf+VLPRohGstCaliNQzf45fwV/wxcML8JuOKn3Xfg=; b=KGeUCk5wyajZMAdcuEqEla8mARrwlFwju09CgMIgAFZlmBmfjousJLBrx1qNO6yU8+ JytD1J/0eUMRfQ8H3UePTpYTAJTO+bHebtSizqgOxt/6h8s66LC3bvSXy58//F8HSKI8 ZuqIFvM2Dryq0P1p72ZMRVQU3RmeR0aovE8YgBs1LqNso/VOQ4ONOLu1efzutrNzJhrU ZuoMOat4gHs+rxaEYTy6+U6UE45BfkB390zF6gRX4uLcTX1rI2DbdvoSA2ei62iasBN5 ZprRWv5gwbrm55zztjSboBYbhSRNShiz0geffdnMhBZZPk32USQ9HEsS2+zZniULyE9B FOqg== X-Forwarded-Encrypted: i=1; AJvYcCUP/sLAj1bjN0XX3WWS5lqrMBiJnmVGvx+e/Zj+NpPjzqU+orM0J0/Vt0gtdhgECGXwBQi8+koLSUIK2r4=@vger.kernel.org X-Gm-Message-State: AOJu0YwlvwcpBzl8e0g6qSYhOcI1Qn7J8H9aUaqNCVF3svYBFL2g9Epw MMG7LrrMEo2n972IZ/rRtcONCv80CHvlBZTgj3IDCmDtsGmJaDQB/CjR05hn8h9Xyw== X-Gm-Gg: ATEYQzw2G4uAqTIUeX3ZQGoV0Fm8XSFig5oTJ9CGU+bJ8fMLnfb2yBgmZwma7vgF0uv FA5gAsVMCYvI346CPrYvktq8vqKpjAGboqmSP8i56G15z0SVUWEKZl63DWspIFAWGjgRRJwaEav JqmjXvIMsAW8cLLpwsQpoK+bERjKvEhMnFXU7Iq+243lTTAWFh7YygJ3RMtKi+pe1LzIugUXPFl 8EyF7V77F9UO64i/9Q31nigTqKFQQ80XOT6s76NPqL8tRfbK7fROJKo2KNJt4Bc1AeRDxinC4D8 +5nhlV4Jo/mdUtjCRxBgHBs711BRtaPsj1r9/dUDpuM8zIiL3Qpi4sjtsi/VAkFqSQFG8lElHoc M9QJFObVbG98QpwkTXMVh3teLgzou7LFGAU6He1TGFK0gcQ7yDsTHB2SXJGacHoEbxPXXvnkpne YYZXFI7ZztniCs98RctQF/Kb3li1prII2awS4J+Lc5mYFADwtH3Dn3JbiDjP3l2u5DgqoKprHwA bApzW/JVEoa X-Received: by 2002:a05:600c:8b65:b0:485:34a2:919e with SMTP id 5b1f17b1804b1-486f44607e8mr76256695e9.33.1773860530585; Wed, 18 Mar 2026 12:02:10 -0700 (PDT) Received: from dmaluka.c.googlers.com.com (202.88.205.35.bc.googleusercontent.com. [35.205.88.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486f8c35057sm8461275e9.5.2026.03.18.12.02.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 12:02:10 -0700 (PDT) From: Dmytro Maluka To: kvm@vger.kernel.org, Sean Christopherson , Paolo Bonzini , Isaku Yamahata Cc: Dmytro Maluka , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), "H. Peter Anvin" , Kiryl Shutsemau , Rick Edgecombe , Binbin Wu , linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)), linux-coco@lists.linux.dev (open list:X86 TRUST DOMAIN EXTENSIONS (TDX)) Subject: [PATCH] KVM: TDX: Fix APIC MSR ranges in tdx_has_emulated_msr() Date: Wed, 18 Mar 2026 19:01:03 +0000 Message-ID: <20260318190111.1041924-1-dmaluka@chromium.org> X-Mailer: git-send-email 2.53.0.851.ga537e3e6e9-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Note: compile-tested only. Bug found by code inspection. X2APIC_MSR(APIC_xxx + APIC_ISR_NR) is incorrect, since APIC_ISR_NR is 0x8, not 0x80, so shifting it in X2APIC_MSR() results in losing those lower bits, making it simply equal to X2APIC_MSR(APIC_xxx), i.e. making the entire range consist of APIC_xxx only. So adding APIC_ISR_NR needs to be outside X2APIC_MSR(). Additionally, since "..." ranges are inclusive, need to subtract 1. Fixes: dd50294f3e3c ("KVM: TDX: Implement callbacks for MSR operations") Signed-off-by: Dmytro Maluka --- arch/x86/kvm/vmx/tdx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index c5065f84b78b..466a7de660c2 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -2136,9 +2136,9 @@ bool tdx_has_emulated_msr(u32 index) case X2APIC_MSR(APIC_TASKPRI): case X2APIC_MSR(APIC_PROCPRI): case X2APIC_MSR(APIC_EOI): - case X2APIC_MSR(APIC_ISR) ... X2APIC_MSR(APIC_ISR + APIC_ISR_NR): - case X2APIC_MSR(APIC_TMR) ... X2APIC_MSR(APIC_TMR + APIC_ISR_NR): - case X2APIC_MSR(APIC_IRR) ... X2APIC_MSR(APIC_IRR + APIC_ISR_NR): + case X2APIC_MSR(APIC_ISR) ... X2APIC_MSR(APIC_ISR) + APIC_ISR_NR - 1: + case X2APIC_MSR(APIC_TMR) ... X2APIC_MSR(APIC_TMR) + APIC_ISR_NR - 1: + case X2APIC_MSR(APIC_IRR) ... X2APIC_MSR(APIC_IRR) + APIC_ISR_NR - 1: return false; default: return true; --=20 2.53.0.851.ga537e3e6e9-goog