From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 D1565483832 for ; Wed, 26 Aug 2026 20:17:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787775435; cv=none; b=Po5gGqyFPwLGrJaL8jVaDx0i+uacaMQiL6kwWaT12Q2hkpeMQc1rvTX9gwshq4gegx3hAs+ltHdFY3tG9KDovnHKwRBzpN1AnCHL4eFNkjyQhfFPZx3duBfWA+/sX45xjjFL3P93D3HWcXOcSTYC7YZXFzm/nb3jMOByB+3lVec= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787775435; c=relaxed/simple; bh=VNoz2VDnlGL7nf6vtZBQ505wury0ZhGaC6JD4dMDDxY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ldH41R4KdvRiMhav7+Y3FTfftwvIT7HDEg4mVd/NdyAXCAfxMy1S6PZQfN6gWjFP7KBToGyAB+6O2VJl7og0cPcBdBrpQCb8Ki2f3/wdh7TSklQJPhWomLcYU/vpK9dtlddOgRp9qkYkL02wHw+K8cDc5xFj/GAnzCpgYt7zBR0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=trailofbits.com; spf=pass smtp.mailfrom=trailofbits.com; dkim=pass (2048-bit key) header.d=trailofbits.com header.i=@trailofbits.com header.b=PS+X2c/g; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=trailofbits.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=trailofbits.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=trailofbits.com header.i=@trailofbits.com header.b="PS+X2c/g" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2d715f4a587so11590385ad.2 for ; Wed, 26 Aug 2026 13:17:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trailofbits.com; s=google; t=1787775433; x=1788380233; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ZP/Zh7VL0NP5ZL/ftf+0Og5kx5+Zk04Hdc0Eb7ielXU=; b=PS+X2c/gGSSLtN3Y1TtsZADJvG5rkhVZRFeOtm6SHUWnRuKdtfsYn+4yCL4gyRNHsm o+8H8sN88sKpNVwb2izvd535/luNvDJecc9or7CZDiXQRZ+HBdHn/JJgkg38ZeQfwkLB QCciHSNj+cLVrP0CDYBsOU8pGQ6lOGESjV+9nF7vjuq6K2muF8GejNL4lUzO7l8sUPC9 chBx7shd1D8OVUe07xH9TvHb4fDiyZNHF1UzbA00SVN20o/9cN5gZTVAVgwKs4B11nkf QVeX4MVrjzkMWEM441Ry/efiEtnzRu78yueam1hfONmK2UbJrZtHdMPpJipHl/u5BGVd Kpxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787775433; x=1788380233; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ZP/Zh7VL0NP5ZL/ftf+0Og5kx5+Zk04Hdc0Eb7ielXU=; b=mJdXs2r2FPxnvxcoQB8Z2jzjJCi9G/mS0JDXJVtCyYgb+lnpBxfKLwyNhfG1ij8gbG D5qAuj+I/bgFnmDHqmNiiS0WA9Tp79DWTi5rqWzV+5zdQlxrQaLscBDN3DWE5+2dO0UK 8AKXN4WPuNMPUdpKHaDh8L+e3tz/+ieFLuOxs0Uy0sANYpRKY6NZTqOilobCfShenzEr QW/Ps3kP2rAG/tPtB4bM45CXcEPQ+CS1kVYEd1DlDou4eJ/eVedx34a9Oy2Twf7SAm+a VJYP+m6vhkXR+r0w1twWC866QQMuy2/c9sVZ61GSmCgRpJiRow1bsBp6K7u2wEtgAKdF ue5A== X-Forwarded-Encrypted: i=1; AHgh+RpqYsXpW7Kmqh5CJguYRe/aJVRGW6OcNo52pfEH0U481/cwsfbNOhcP+DpEBfyOxaMRUhnUeHvOm9NnqHI=@vger.kernel.org X-Gm-Message-State: AFuF++mNxD6r+C1UU6LfKoKnH/UHBx6JNYmKIWFNb/iaiRcpA25JmhEp UiM5pmSA6gpx50Rtwr5E4Sv/pH/cOS/DRwiVuLTO/jlsJP6bnR+aPf2A8dDt2JnyH4Q= X-Gm-Gg: AR+sD13zJ71JwoJ/NIlzgebQsMAhJs7zJWAAmH5e9VeGg0qG1eoxw9NqgWrosgYsLNY w6f0wnjFOKc4ZtkuMUXct8xDhbh5E0r3sU1lbbRbxZlnzRkrY4AfzEnksdc9PRXLdYHYAH5R2Gu pWFahAUa0EItJ1Re3MzA6rRG59cH6TSJV3gIGp8bnOwljvhqgtraBnIQL8JXe+9VhZZy5UDNn+f bMSrpsnUTnixFvGYiQRmtsgueT5RUwNiI8OaIHrWY8HulhbyYZxfyxjLFKAq4zljEybFmmsniBn 371RYUlWs3vBdrVtefI7KzkqwU6JxVjGlqP87j8HeGRCGeYPWLwe+i2kor6BGlTqNMEXkiG3fuM NJJP3QtWgU8GPOI4qtAfJbrfg2hKs6wMNWJBcUYVIivm0s7JOrI+2ZFpxRP4+hTLVr8nn812oWT Tdf6SBU2Itx8KB4FV1oH1k1OlGcSyAGdBDjP3os5PHI+qUdp5ry0NUqGmMuVy/+Q+xdRuNYMt2I U1Szca0rDLkPvBF1SqceoVgefbAfPHkOeSd8a4xuaMtHT/Ke71en94z8UE= X-Received: by 2002:a17:902:f546:b0:2ca:61bc:317c with SMTP id d9443c01a7336-2d707b60764mr156912635ad.13.1787775433400; Wed, 26 Aug 2026 13:17:13 -0700 (PDT) Received: from localhost.localdomain ([2603:8001:5f01:8bab:957:eb3d:7323:2ed]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3283d60b59dsm11179738eec.3.2026.08.26.13.17.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 26 Aug 2026 13:17:13 -0700 (PDT) From: Artem Dinaburg To: stable@vger.kernel.org Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, seanjc@google.com, pbonzini@redhat.com, kimjw04271234@gmail.com, Artem Dinaburg Subject: [PATCH 6.6.y 1/2] KVM: x86/mmu: Check write tracking in all address spaces Date: Wed, 26 Aug 2026 16:16:54 -0400 Message-ID: <20260826201655.9198-2-artem@trailofbits.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260826201655.9198-1-artem@trailofbits.com> References: <20260826201655.9198-1-artem@trailofbits.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jinu Kim commit 0f38453cdb2e17566ccb7c0f3dabd5bd21caca26 upstream. kvm_gfn_is_write_tracked() checks only the supplied memslot, but page tracking is per-address-space and shadow pages are shared across all address spaces. With SMM, a GFN can therefore be write-tracked in one address space and appear untracked through the other. Check the supplied slot first, then the slot for the other address space. This ensures all callers honor write tracking regardless of the active address space. In particular, it prevents mmu_try_to_unsync_pages() from marking an upper-level shadow page unsync and eventually triggering the BUG in pte_list_remove(). Fixes: 699023e23965 ("KVM: x86: add SMM to the MMU role, support SMRAM address space") Assisted-by: Codex:GPT-5 Signed-off-by: Jinu Kim Message-ID: <20260721103512.2136240-2-kimjw04271234@gmail.com> [invert direction of the conditional. - Paolo] Signed-off-by: Paolo Bonzini [ artem: adapt to 6.6, which has neither KVM_MAX_NR_ADDRESS_SPACES nor kvm_arch_nr_memslot_as_ids(); use KVM_ADDRESS_SPACE_NUM instead. That macro is CONFIG_KVM_SMM-conditional in 6.6, so the guard on KVM_ADDRESS_SPACE_NUM > 1 around the peer-slot lookup is retained ] Signed-off-by: Artem Dinaburg --- Target tree: linux-6.6.y (stable). Verified: applies to v6.6.153; arch/x86/kvm/mmu/page_track.o builds clean with CONFIG_KVM_SMM=y and with CONFIG_KVM_SMM=n. arch/x86/kvm/mmu/page_track.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/mmu/page_track.c b/arch/x86/kvm/mmu/page_track.c index c87da11f3a04..2615074a4bff 100644 --- a/arch/x86/kvm/mmu/page_track.c +++ b/arch/x86/kvm/mmu/page_track.c @@ -117,13 +117,23 @@ void __kvm_write_track_remove_gfn(struct kvm *kvm, kvm_mmu_gfn_allow_lpage(slot, gfn); } -/* - * check if the corresponding access on the specified guest page is tracked. - */ +static bool __kvm_gfn_is_write_tracked(const struct kvm_memory_slot *slot, + gfn_t gfn) +{ + int index; + + if (!slot) + return false; + + index = gfn_to_index(gfn, slot->base_gfn, PG_LEVEL_4K); + return !!READ_ONCE(slot->arch.gfn_write_track[index]); +} + +/* check if write access is tracked on the specified guest page. */ bool kvm_gfn_is_write_tracked(struct kvm *kvm, const struct kvm_memory_slot *slot, gfn_t gfn) { - int index; + const struct kvm_memory_slot *other_slot; if (!slot) return false; @@ -131,8 +141,18 @@ bool kvm_gfn_is_write_tracked(struct kvm *kvm, if (!kvm_page_track_write_tracking_enabled(kvm)) return false; - index = gfn_to_index(gfn, slot->base_gfn, PG_LEVEL_4K); - return !!READ_ONCE(slot->arch.gfn_write_track[index]); + BUILD_BUG_ON(KVM_ADDRESS_SPACE_NUM > 2); + + if (__kvm_gfn_is_write_tracked(slot, gfn)) + return true; + + if (KVM_ADDRESS_SPACE_NUM > 1) { + other_slot = __gfn_to_memslot(__kvm_memslots(kvm, slot->as_id ^ 1), gfn); + if (__kvm_gfn_is_write_tracked(other_slot, gfn)) + return true; + } + + return false; } #ifdef CONFIG_KVM_EXTERNAL_WRITE_TRACKING -- 2.43.0