From nobody Tue Dec 2 01:36:14 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.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 920522BE64A for ; Fri, 21 Nov 2025 22:34:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763764492; cv=none; b=sWLe6TYQg1fBy3nhB0DcsowBcxEeafYI7R7Nv4xJGplgvUJgjR3WQtYw4PiOw8Ex51Tw50VJn8RZFBgHIePYdnwU5ZhEpm8nVC7LzwVjICstGX4Xgz5BTAn6Lw6fhX6UKcxfFCNktYGQuoo1vl7mk+HnmLxqhpYR3lAu9tZrBXo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763764492; c=relaxed/simple; bh=Cm8gNTD5HDKhB/YGSur7bO18CAjWuu8P/nm0G7TmJAI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OctKg1UVAiLqaPCqoLXBV9LD0pRvHvdnmPr3CTW6WQ72M/F/c2XanGXDNv6W6OE/nYLqFuUh0vgPHenudTj7qkZ/ZSQ00ym6hi/kztn5oGnO0jtvWRgqlLZHct8CJoZdJaHKn6B8NLqEL7OzXZjUiKNvcppsx5Tpavr9hqmKh0c= 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=KxoNE8cz; arc=none smtp.client-ip=209.85.216.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--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="KxoNE8cz" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3436d81a532so5227871a91.3 for ; Fri, 21 Nov 2025 14:34:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763764489; x=1764369289; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=fL7AO/YbZegwLET4orHpyrj5KMZ/eiSlht4bCLj4XfI=; b=KxoNE8czMhrAIuqTXID3hOPgYM4/aOkcwU8BQ9P9NkIJ/Hh7vptj6ajnvZzjQaDH6s iFXGGU0xV8zN9AvkoK7hucxo8m4fy8VEAK+YAc6G+UNvyzg80BS6nVerjwd+r5SIimW0 Ffp8BTOOhn2oSgyJrv8onnougpkCb3bDVLpGEYmPchAcG1o5YlzQDNhEPS0iY3ECzxW7 BBEDF0Wq8o+8LQH9NObsYc9EWeFiqJ+E+9z37M5uUPk7S9gbpXJKQGVIeid2gqY34zVn AYXuPJFeZILfkMnTi4a9LaG6AyuIzGElg3UHseA3Czq/kTQRXMgzVntxWeXBTO4KG186 sqDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763764489; x=1764369289; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fL7AO/YbZegwLET4orHpyrj5KMZ/eiSlht4bCLj4XfI=; b=f4ZrgM2Ve4OLwgMEsuHB7lFr8CDBVcjPwN4knUOMMhrCBRXoq7BypcCoOlkd2DgCjY lHZVc3L2mj8HvEQMOjAeTTNhYJSF5MhMBcmNhSyPrIyY6Jea0H9EfbvIkfY9sCVwD61m ozTSXkGGRhC6p06En7iooVeFYJ8Chu20nMArABtUKyYEYx66T5Xo4XEqJAbNQPqfyFZI o3hiUIJvUuMN4yOfU+SwJuw5poxFSp23WLRiX+8mQR3n9i5AbGeHS3x7yKQ7VtlBBfVG nrGoCBnFM8yIGne0R/+gMMamDmAYvR8thSK9OZ37FIxOBGtx5fvTU7d3mCrsSOKsFtj4 jOfQ== X-Forwarded-Encrypted: i=1; AJvYcCWWk4A9kEbqOBiz0rOOJlruP3cxFccVqy2v6AGPXshW/VasdlCtPH8p0q3X/AHQ47gB0UHdbCpMYZojKH0=@vger.kernel.org X-Gm-Message-State: AOJu0YwaNYTpDXIX/hvP2DlSzhoAy2DgwbfGHXTqngZao0BPFio1CjJ9 DVM9oSFkocVEHcacGV/6Nz8VdMyvLLGv6mQvAWbkbRjLyC1ECZRq17X8yRxBfFFD2xmMHMG6QIW +Wp7sdw== X-Google-Smtp-Source: AGHT+IFx38F9ERfpPh0lVhU0L2PRJHoxe79c5A/zraSF90gTXT2UYGC9P0VIoAeDIru6h3DDh0xdhuRVZb8= X-Received: from pjty8.prod.google.com ([2002:a17:90a:ca88:b0:340:c06f:96e7]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2d0c:b0:32e:389b:8762 with SMTP id 98e67ed59e1d1-34733d845bemr3846543a91.0.1763764488614; Fri, 21 Nov 2025 14:34:48 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 21 Nov 2025 14:34:40 -0800 In-Reply-To: <20251121223444.355422-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251121223444.355422-1-seanjc@google.com> X-Mailer: git-send-email 2.52.0.rc2.455.g230fcf2819-goog Message-ID: <20251121223444.355422-2-seanjc@google.com> Subject: [PATCH v3 1/5] KVM: Use vCPU specific memslots in __kvm_vcpu_map() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Fred Griffoul Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When establishing a "host access map", lookup the gfn in the vCPU specific memslots, as the intent is that the mapping will be established for the current vCPU context. Specifically, using __kvm_vcpu_map() in x86's SMM context should create mappings based on the SMM memslots, not the non-SMM memslots. Luckily, the bug is benign as x86 is the only architecture with multiple memslot address spaces, and all of x86's usage is limited to non-SMM. The calls in (or reachable by) {svm,vmx}_enter_smm() are made before enter_smm() sets HF_SMM_MASK, and the calls in {svm,vmx}_leave_smm() are made after emulator_leave_smm() clears HF_SMM_MASK. Note, kvm_vcpu_unmap() uses the vCPU specific memslots, only the map() side of things is broken. Fixes: 357a18ad230f ("KVM: Kill kvm_map_gfn() / kvm_unmap_gfn() and gfn_to_= pfn_cache") Signed-off-by: Sean Christopherson --- virt/kvm/kvm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 9eca084bdcbe..afe13451ce7f 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -3118,7 +3118,7 @@ int __kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn, = struct kvm_host_map *map, bool writable) { struct kvm_follow_pfn kfp =3D { - .slot =3D gfn_to_memslot(vcpu->kvm, gfn), + .slot =3D kvm_vcpu_gfn_to_memslot(vcpu, gfn), .gfn =3D gfn, .flags =3D writable ? FOLL_WRITE : 0, .refcounted_page =3D &map->pinned_page, --=20 2.52.0.rc2.455.g230fcf2819-goog