From nobody Mon Feb 9 18:01:18 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 3ABB42728EA for ; Tue, 10 Jun 2025 22:58:30 +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=1749596311; cv=none; b=Hphmrns/dWSu1NGLkuz9ytjVwFwwn+lG7ZKmlNIPU4tYEN0BEckjcUvkdenOpwNaYCACd8ujAb6E7NLc717z6/h5pecTCI7v0xKpytZ/FNWuaL+aGUyVfFHGbX4fZqOkP3HJ2fo2dROXQ4aewtXsMl+YcqUIYgCjxQZh0TmCk8g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749596311; c=relaxed/simple; bh=8NMBQOCUZTnUF9bMbeLcv+0oeOUiSq+zhN1NQGpaPdI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=klwIVZXAtG3awhERErdPeyEwVdLmAEXdQXLwf9Fde4NbwULI1zPux5eVTQCA4GaCbYqt8BpFBoARtdnF2z2/eSjKu51b5BIDrxj6F/kw8cZJXwRh37NflJD8eQhFzWq5xXjyb9398N12VaIDk5lDVpiaWcADfIX+cAI6lkjTUYs= 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=H08fBhPl; 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="H08fBhPl" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-30a39fa0765so8614681a91.3 for ; Tue, 10 Jun 2025 15:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749596310; x=1750201110; 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=ercvOy9gSaz/2KYqxyQat5mFHIbfugbgpQQnPekIEBg=; b=H08fBhPlhd/gYyBg/27O+2e/reVllsvC/hx5HQGAM7yvx21igWobfKLzOMvbbMKeVd 5QSA6cXXZA1CYjl3bJjZStpDW4VC+ydHwdQDUwB+5VT54Fx4zs6TY3JkdDv0uckbt+IV Y2Da7PYm0DPqR3+J6Zfw1qDDRcUFpqp0wQxYl/xXx/EOj5d0//HadkaX3yp9P67koGcq 0l1ItOcYE3MDaiVIOqZxERFJEyqeGlCCEihe5CHXWlp/PsLg5TitUF+nCl4ZvzQ1pl97 RWQoD1R0OWlibF4NduDh/ey0iebvBJlGCaAMj0bX4hyKkiB7tNaDZfkjLIL/Vcqsj5Nj 11fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749596310; x=1750201110; 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=ercvOy9gSaz/2KYqxyQat5mFHIbfugbgpQQnPekIEBg=; b=nHaA0+tusg4WnEsOnBNQiO20YFQbiUIyafcQLA1X1pTBojYHyoUvaKpytz0/8eTDrQ CEWRutkGVAtU+6kZ/YyqLT6Y/Lb1H6yy1xuCaVTgYLtyXJoG4GCbIcgqxZ4EEipBnx5a ahUleht46ai+Vb6qovbye9ihzkoIyueJgKGSfA5Vss85mnrQew6DuFQovwVer2wzvhue +4E9nH5cYlcVhZykMS9XGRMVOqi4LTy93d58VWedeyK2MmAzHNfLJewXwuF9BlubqLWN jiOh3Mz3KAX04MnX6cFblyq6tKehmiaYOcFTXhSjHmVUkqtiQXYazoOyx9fyX/oaA2Jj W3/w== X-Forwarded-Encrypted: i=1; AJvYcCUW3yR9XYeu5ZkmoYCXucdKClZ9mXtXHxv4LVvSDQdUX6ROZPe74poXLHfs5NnCDmXS9kfeD44td8B66oc=@vger.kernel.org X-Gm-Message-State: AOJu0YzDN+b6dEqDBF2T3umDIPMi8VQux49Ctbl0+1RaQ0bztXK9Upk9 b4QnzqFn+JMjoLjeMk3ofQyK3f+ojfPkGO5g1P8eYeuNjqSyFrv5i0T7+sXbbTIaIE/6J4BEV5y IMLFE6A== X-Google-Smtp-Source: AGHT+IEmRs2SQrVc9GLzODa7Y2S+4DXyFTYFnYNrEP6EPnF+UanD+KwvLvf3wI3VyrpU1ZlG6ydbLvn4nsI= X-Received: from pjbos6.prod.google.com ([2002:a17:90b:1cc6:b0:313:245:8921]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2809:b0:311:fde5:e224 with SMTP id 98e67ed59e1d1-313af0fd089mr1614276a91.6.1749596309756; Tue, 10 Jun 2025 15:58:29 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Jun 2025 15:57:34 -0700 In-Reply-To: <20250610225737.156318-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: <20250610225737.156318-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250610225737.156318-30-seanjc@google.com> Subject: [PATCH v2 29/32] 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, Chao Gao , Borislav Petkov , Xin Li , Dapeng Mi , Francesco Lavra , Manali Shukla 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 7ca45361ced3..749f7b866ac8 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -196,6 +196,7 @@ void recalc_intercepts(struct vcpu_svm *svm) */ static int nested_svm_msrpm_merge_offsets[6] __ro_after_init; static int nested_svm_nr_msrpm_merge_offsets __ro_after_init; +typedef unsigned long nsvm_msrpm_merge_t; =20 int __init nested_svm_init_msrpm_merge_offsets(void) { @@ -230,10 +231,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 bit_nr / BITS_PER_BYTE / sizeof(u32); + offset =3D bit_nr / BITS_PER_BYTE / 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) @@ -261,8 +262,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 /* @@ -289,15 +290,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.50.0.rc0.642.g800a2b2222-goog