From nobody Wed Feb 11 05:18:05 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 BA5EA26B094 for ; Thu, 29 May 2025 23:41:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748562065; cv=none; b=bdc7gk0H1+NXxJR3/ROiJ9YCq1Ijk7WzuAdzpVgFUgm8fv2UDpxu5AsyqZfjHrAWs3ZNVgGmdaTmyFVutm8fI3q6abiaAVIJRl6CDfTB1+B7eSGSZzIhLZ16IzNCWKNtPMlOr3RlO3ODNWBB9JNXUTIUou17qNav90xuMzMJRoo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748562065; c=relaxed/simple; bh=tsblVO85XoDjTNiWEa3udBEZ0r8PDQUQXfsZoNEoi1Y=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=B+njcRkn6ajX4emEp6lbd9ckwSyQIN0aDr38jobPWrk90MYvTWNjyzjznteGlEAaodf6LMSylnlzS9NLTr0P7wQQRWdoqr1iKsnVKC8WkUvhiS4TWrNMJYjun3j/+uVb/6gLcMffCZlvmvnIS+O0wmmi7VL0LcgRJ+NnR4BpF7A= 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=3SPZQgR2; arc=none smtp.client-ip=209.85.216.73 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="3SPZQgR2" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-311b6d25278so1455105a91.3 for ; Thu, 29 May 2025 16:41:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748562063; x=1749166863; 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=NTiX6sorGYCjVyu6VPciOEYdAyiyqpHL947Q3I6wQJk=; b=3SPZQgR2QGDWg15uTnqK2CpT1panVF/DXcylZjY6FVfhvHJnQM1t7i47prvBOgR84w B2RDRur1/MO5YvdLmtxtUPONtfucr8lTWcgLJoveKBDItYKdYlC+FR+vfJEQP/sM/DZ9 8VSqc91IOXGeJdmnnqdUai6xB6gAdTGNIsjjcOwH1mkp/1rLrE4CgBx5yZ/kGefiSvzz KTpGqfl5vUlc1WmCmy04gSl0FMjxcexK4HH/wTXHeBiv+54wKnAOfZkkLA0Qve3kAKuY BmyWUR5eaC2E0cdKCknR8S/W3nTtNpv07F+ysf0Q7hO2PNl73peGzT+LTNKoHQKIIqm9 yWgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748562063; x=1749166863; 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=NTiX6sorGYCjVyu6VPciOEYdAyiyqpHL947Q3I6wQJk=; b=HnGFdH8UttGoMO5mMfnNhmU7hdRvjDw6m4xv52jmvXgfGp9qahpNz1j4s8AA2kRxMO qI4TwE74o2N/T7rROPttR56jAeoz5M8pgYk8ZkppONRZDFGlPqr5PkZvUAItxXjqzTut BNuNKfHEQzI9gkUtUt3dQJzNJ9AuPZimnbQvEbE6/RzUkfMhXzJRYVknekzhXyXVjw4o tGF4YgCgW9eSfUjKf+nlajgekvxipL4egPjNhP2aFl9OflFKa64TsvLYbMEzt8wHn+PO QCqUAHZpjObjiz+6lVDYgh+bml7gGyObDSL6vFb1M6/XgS2uXXqQ35lSjql7pKbV2yl0 a6KQ== X-Forwarded-Encrypted: i=1; AJvYcCWmtVvbP0MyPBmR4Pf6ztMxR4Qxb4qM/iFzmkDcyyVMJiD3q1/Vqd7IMblBTnXQdmXJlBGIiUh+wTE171Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yyjz4FSk0PJoAJXBoWp6Yeel40b4Vh5kSKRUkLoiEhHOtRH/hsX rvpF2ZPt2lsP+AWana9J0PmSswi83fkbXyytt+9pwSE0bWdxMUPBcIa33kKvNR0jKJ59VRRZZQ2 Ci/fbyQ== X-Google-Smtp-Source: AGHT+IHFPNRf85vhQW/Vp+4EXHWKl7Nvisj67P5EudGcWW95ABwEWKiz/7SumHmo1hjKp55lMs20QG9HBlw= X-Received: from pjk14.prod.google.com ([2002:a17:90b:558e:b0:30e:6bb2:6855]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:55cb:b0:312:26d9:d59c with SMTP id 98e67ed59e1d1-31241e8e674mr1667162a91.22.1748562062955; Thu, 29 May 2025 16:41:02 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 29 May 2025 16:40:12 -0700 In-Reply-To: <20250529234013.3826933-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: <20250529234013.3826933-1-seanjc@google.com> X-Mailer: git-send-email 2.49.0.1204.g71687c7c1d-goog Message-ID: <20250529234013.3826933-28-seanjc@google.com> Subject: [PATCH 27/28] KVM: nSVM: Merge MSRPM in 64-bit chunks on 64-bit kernels From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , Xin Li , Chao Gao , Dapeng Mi Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When merging L0 and L1 MSRPMs as part of nested VMRUN emulation, access the bitmaps using "unsigned long" chunks, i.e. use 8-byte access for 64-bit kernels instead of arbitrarily working on 4-byte chunks. Opportunistically rename local variables in nested_svm_merge_msrpm() to more precisely/accurately reflect their purpose ("offset" in particular is extremely ambiguous). Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/nested.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 60f62cddd291..fb4808cf4711 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -184,6 +184,7 @@ void recalc_intercepts(struct vcpu_svm *svm) } } =20 +typedef unsigned long nsvm_msrpm_merge_t; static int nested_svm_msrpm_merge_offsets[6] __ro_after_init; static int nested_svm_nr_msrpm_merge_offsets __ro_after_init; =20 @@ -234,10 +235,10 @@ int __init nested_svm_init_msrpm_merge_offsets(void) return -EIO; =20 /* - * Merging is done in 32-bit chunks to reduce the number of - * accesses to L1's bitmap. + * Merging is done in chunks to reduce the number of accesses + * to L1's bitmap. */ - offset /=3D sizeof(u32); + offset /=3D sizeof(nsvm_msrpm_merge_t); =20 for (j =3D 0; j < nested_svm_nr_msrpm_merge_offsets; j++) { if (nested_svm_msrpm_merge_offsets[j] =3D=3D offset) @@ -265,8 +266,8 @@ int __init nested_svm_init_msrpm_merge_offsets(void) static bool nested_svm_merge_msrpm(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm =3D to_svm(vcpu); - u32 *msrpm02 =3D svm->nested.msrpm; - u32 *msrpm01 =3D svm->msrpm; + nsvm_msrpm_merge_t *msrpm02 =3D svm->nested.msrpm; + nsvm_msrpm_merge_t *msrpm01 =3D svm->msrpm; int i; =20 /* @@ -293,15 +294,15 @@ static bool nested_svm_merge_msrpm(struct kvm_vcpu *v= cpu) =20 for (i =3D 0; i < nested_svm_nr_msrpm_merge_offsets; i++) { const int p =3D nested_svm_msrpm_merge_offsets[i]; - u32 value; - u64 offset; + nsvm_msrpm_merge_t l1_val; + gpa_t gpa; =20 - offset =3D svm->nested.ctl.msrpm_base_pa + (p * 4); + gpa =3D svm->nested.ctl.msrpm_base_pa + (p * sizeof(l1_val)); =20 - if (kvm_vcpu_read_guest(vcpu, offset, &value, 4)) + if (kvm_vcpu_read_guest(vcpu, gpa, &l1_val, sizeof(l1_val))) return false; =20 - msrpm02[p] =3D msrpm01[p] | value; + msrpm02[p] =3D msrpm01[p] | l1_val; } =20 svm->nested.force_msr_bitmap_recalc =3D false; --=20 2.49.0.1204.g71687c7c1d-goog