From nobody Thu Apr 2 06:27:03 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF3682367DF; Tue, 3 Mar 2026 00:34:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772498080; cv=none; b=K+OmMm4bsc3OL16+NKg5v3yjB280m37wCE8/6pdNJKMTIbsraGJstY2HcLPY0tuqL3OBa4QoLkqWhCSGQNk2x06Ih78iVPwa8UzmQIM82qaViLfQHe3y4wlsH2UbIVKUU3t3/Vv9+l4LsktBn2VIpLPY+bkQs/Mr2GHa/zqv1VY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772498080; c=relaxed/simple; bh=fj6FLXq+xF1/WvdvmFuZXB1XYHfJzjPbj4Xu3XDLoxY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=clQ1qV/hw/Lgbs/P04VuiFInY6k8wVXreM5c1++YrwWFIn6uTnCfCZnZ3y5YxVBTuv69blF3Q+o5WpU+vgqgtYofD4taDePQ24QMV83Su1T5OR802U7MdAytKmI9cQ2NMPMDm7748zbgvvAKWu/o4LjsH/dsQb1YrLU0LCF48dc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rEM5J6YD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rEM5J6YD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4295CC2BC86; Tue, 3 Mar 2026 00:34:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772498080; bh=fj6FLXq+xF1/WvdvmFuZXB1XYHfJzjPbj4Xu3XDLoxY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rEM5J6YDT1pPqvT1YX4cXLGiCYn8eASdYQIqSPWuFcMQe7ssaS9OYRjtvfWlp393G Vfpwa6ZZfZX/ioA7LwFzXr+m3VM4OdrLPD38gQFbMddftfO1uE8BO0meXhszEWXnz8 bsA6Gtwtgf6n57zwajyga7Y/PZCTA2CNjgqS1U5B4gO09GMnxu2fccAccSowLVzXR6 sUkX/6512XX3Fn4LC/EGn0JGtyVBJ1Y2s4k5XKwlHbNTF0EqTvILA3SKEv3p2w/pql iuEjImhEObs2OjGc8TOY/d2ruqVy0wg07VVyTNz2Key6mZcrQ/BiR/N2Z5go4vGm6A KW7Rwza2P8NBQ== From: Yosry Ahmed To: Sean Christopherson Cc: Paolo Bonzini , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed Subject: [PATCH v7 22/26] KVM: nSVM: Use PAGE_MASK to drop lower bits of bitmap GPAs from vmcb12 Date: Tue, 3 Mar 2026 00:34:16 +0000 Message-ID: <20260303003421.2185681-23-yosry@kernel.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260303003421.2185681-1-yosry@kernel.org> References: <20260303003421.2185681-1-yosry@kernel.org> 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" Use PAGE_MASK to drop the lower bits from IOPM_BASE_PA and MSRPM_BASE_PA while copying them instead of dropping the bits afterward with a hardcoded mask. No functional change intended. Signed-off-by: Yosry Ahmed --- arch/x86/kvm/svm/nested.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 0151354b2ef01..2d0c39fad2724 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -493,8 +493,8 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcp= u *vcpu, if (!guest_cpu_cap_has(vcpu, X86_FEATURE_NPT)) to->misc_ctl &=3D ~SVM_MISC_ENABLE_NP; =20 - to->iopm_base_pa =3D from->iopm_base_pa; - to->msrpm_base_pa =3D from->msrpm_base_pa; + to->iopm_base_pa =3D from->iopm_base_pa & PAGE_MASK; + to->msrpm_base_pa =3D from->msrpm_base_pa & PAGE_MASK; to->tsc_offset =3D from->tsc_offset; to->tlb_ctl =3D from->tlb_ctl; to->erap_ctl =3D from->erap_ctl; @@ -516,8 +516,6 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcp= u *vcpu, =20 /* Copy asid here because nested_vmcb_check_controls() will check it */ to->asid =3D from->asid; - to->msrpm_base_pa &=3D ~0x0fffULL; - to->iopm_base_pa &=3D ~0x0fffULL; to->clean =3D from->clean; =20 #ifdef CONFIG_KVM_HYPERV --=20 2.53.0.473.g4a7958ca14-goog