From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 E4A673AEF45 for ; Mon, 9 Mar 2026 14:23:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773066209; cv=none; b=L9XvOEKyXeO4Xzk8ntfkrkqTBNAeAZ37WbI6AP/h1PdPCGxQdarTFPA7iQ942sCGvKa5A7jR+iWZY+1K6XFyS3GodhnJhqTt+rPeu8FhQ/VUO7ObqUacp3vYZKB5TvSFIrNK1/TF13FFilA/rwfOY+lfEVvFIOdrChDNKiPSv6w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773066209; c=relaxed/simple; bh=DHJovIUifZmiMrcpaD1G/lVcb5G1OJKfRHhgdocQjWU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HvguvhpfUfcl5/rjZHYV0lYJ4GjiLrsix/gUT8c3fOV2PnXVXkQ+vAK/sSl5DU4reFsY0FbObta6scem7L4Ddk+OOWvA4Q7KYKo4xfb/b+Vkv6ft1PZOshh1LZgNqcUL11Np3qBFlzIzgb4NYgycX0BQSNSvu2mWqXyfwHyBmDs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=udrhlORg; arc=none smtp.client-ip=209.85.215.202 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--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="udrhlORg" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c7385e8fa73so2751826a12.3 for ; Mon, 09 Mar 2026 07:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1773066207; x=1773671007; 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=OwZyNSCbcWMk32tFzPVIR/xIQcy7BRbkN45i85aUQNo=; b=udrhlORgKkEcmMF4XuC5+J+wbRtiqGCzWT2l2C2jiA3JpS145WJDwIyG5TMdb7sBzs NefDKV/FlTUHtYD/imzGdrQlbEIFaBzdvXWYhlvLFI1AivmI5HLaLvpNXsVDO2aZb4Im DacaFkoJJKZM9EZVRlLHVstBF+BM2y9Ghfv0QJtKBae+FutTrEU7qu4ylChg5oV1npEq giilKKJSkrZEEzmX4KGHEpb8MxHQE6Yotq4J7gUKLvOLdCBiagVbCf/YJVq3kJf7NgOs gZADGf77UhqVxFom2QoZphY1x5ycUfGfjcPGobY7TscHdEYH+0S3W4sqiTJOoOnn4VUZ Uorg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773066207; x=1773671007; 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=OwZyNSCbcWMk32tFzPVIR/xIQcy7BRbkN45i85aUQNo=; b=Uc9xjiubdq389S7yCYLX5/67M2/DYcWdpR4rycWSvhQCRJb5QJgb7Qd0WYGatAZg2r gXFYCRqaqpqwWT1Q03xs1l/gr+WCgMTso1UkKQm37xSdT6hND+O6EAyYgkCAOre5AJrV yI+0i1uYis95ns1YkE+7WmKpMS1oHhv4eQ6Bg4LshobrCxn9FnAkMW0XoaesKQqX8913 vbZ5ITtq4qyYK+Nhgy9LsNub+7S4qUwKhn8ICghy31HTuWr9QUJgWlJRMi5EXudgXmnq DAoW5QJ77sBcizSAcuRr61l8eK9KDZvD2sboWYPn1CZH3t40EaJlHQHesa4Lv76a2g3T qgFQ== X-Forwarded-Encrypted: i=1; AJvYcCU/oOhjv9rcWSJvx2I1E8iGDSN83Iy929bJ6uaKLCKLlR17qcDBl90z9hPb9f5dVULk6MXNZds9XjyPOF8=@vger.kernel.org X-Gm-Message-State: AOJu0YzEiO5E6BYoEdwxVmo7OPWzufWTzoCVvuT/IEdMDrYll8gLT0xj 6Pi5MOsKbSzIcqiuRSgRQHuV+yd+AGRDymi6zC3HyQFAAvsrWSIzt+Mo6OvGqhw8Y+3G89nE0aO E3LVBDA== X-Received: from pgbfm10.prod.google.com ([2002:a05:6a02:498a:b0:c73:8d3b:5c87]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6300:6697:b0:398:840d:39aa with SMTP id adf61e73a8af0-398840d517fmr4912733637.29.1773066206999; Mon, 09 Mar 2026 07:23:26 -0700 (PDT) Date: Mon, 9 Mar 2026 07:23:25 -0700 In-Reply-To: <20260309083844.217215-1-pcj3195161583@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260309083844.217215-1-pcj3195161583@163.com> Message-ID: Subject: Re: [PATCH] KVM: x86/tdp_mmu: Fix base gfn check when zapping private huge SPTE From: Sean Christopherson To: pcjer Cc: kvm@vger.kernel.org, pbonzini@redhat.com, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" On Mon, Mar 09, 2026, pcjer wrote: > Signed-off-by: pcjer > --- > arch/x86/kvm/mmu/tdp_mmu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c > index 1266d5452..8482a85d6 100644 > --- a/arch/x86/kvm/mmu/tdp_mmu.c > +++ b/arch/x86/kvm/mmu/tdp_mmu.c > @@ -1025,8 +1025,8 @@ static bool tdp_mmu_zap_leafs(struct kvm *kvm, struct kvm_mmu_page *root, > > slot = gfn_to_memslot(kvm, gfn); > if (kvm_hugepage_test_mixed(slot, gfn, iter.level) || > - (gfn & mask) < start || > - end < (gfn & mask) + KVM_PAGES_PER_HPAGE(iter.level)) { > + (gfn & ~mask) < start || > + end < (gfn & ~mask) + KVM_PAGES_PER_HPAGE(iter.level)) { Somewhat to my surprise, this does indeed look like a legitimate fix, ignoring that the code in question was never merged and was lasted posted 2+ years ago[*] (and has long since been replaced). The bug likely went unnoticed during development because "(gfn & mask) < start" would almost always be true (mask == 511 for a 2MiB page). Though mask should really just be inverted from the get go in this code + if (is_private && kvm_gfn_shared_mask(kvm) && + is_large_pte(iter.old_spte)) { + gfn_t gfn = iter.gfn & ~kvm_gfn_shared_mask(kvm); + gfn_t mask = KVM_PAGES_PER_HPAGE(iter.level) - 1; + + struct kvm_memory_slot *slot; + struct kvm_mmu_page *sp; + [*] https://lore.kernel.org/all/c656573ccc68e212416d323d35f884bff25e6e2d.1708933624.git.isaku.yamahata@intel.com