From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (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 3203B2F90C5 for ; Fri, 24 Jul 2026 00:48:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.197 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784854092; cv=none; b=ORBJ0X7MENtjC0ChYN5jovyqh5Wjqr0YkVZXPdylLwKPVWJtos6shbggoGgdb86rWizyZT/gVVsN1PS50y9sUacPtIBOpbPJKxsf/xN47gRxLh3m6McX/qrEL4QiHVS7W02fKP6APCruMiarMpOuGngh+IapxM7kdquMYIUTNDA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784854092; c=relaxed/simple; bh=x0PAa8IBJmXHm1gQYK0iTZo+wCn5WvFspcJap6yJ2jY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=J84e2Y3RB8KLNCX7QzEowcEdXZCmKIgnDmTydhBzdL0lnR3eFcTs6Kj9R5CsQcF6PbEtWanJ5+MFLr0eDXbJfi/wrfiwc4YT+TxcEr55SuG9EYUPTcGXa3ggOYXFCxo51wTYneqgnrHxGz3iO98mSPTn6aLiSQAPH6tpwF0r704= 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=dst0a8mm; arc=none smtp.client-ip=209.85.214.197 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="dst0a8mm" Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2cc88e22f92so30267135ad.1 for ; Thu, 23 Jul 2026 17:48:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784854086; x=1785458886; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:reply-to:from:to:cc:subject:date:message-id :reply-to:content-type; bh=tr4QID59hK65Du0CDEGLYDncOCtn06VQ/PfFkprj5Bw=; b=dst0a8mmSA5j7pW6nRmRzGP4+pr21JTNYAhFyJvfr4Qq0vM8Fe1SVrD4oeozvWt29Z gMYo+J8kD1XMYEYMBRqPlpdBU+L7S5bpQt4KazkLalIoTAZA9p9Kp3m36u5//kExbR3V 4QvB72S8dFqjSXJF3F5HdRA1Bm3Fum+XUOI/0OHa/FbzrsYyfsKk0mKbh25+rNXp8Azs wt79GDPE6CAfJoxCrtiRllN9+Lpai7XogPkwwYSQKktYoIJHUtDgu8fqL+KhQQW2SZDw xOcTOt5z1Xk6DqsMdi2l9NIVGnp4War8//pKiN0qYpVwTOv9hbaZBW0ShEC2BydE67/N J80Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784854086; x=1785458886; h=content-type: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:content-type; bh=tr4QID59hK65Du0CDEGLYDncOCtn06VQ/PfFkprj5Bw=; b=Ke1uurqFWS/8wXao9R7hnkgysloccGNFZlbW6YUK71jhyNcthv01+nkWJk7+2mpW2o ZhhTHuHDgrklD5twHqo3LHyLTuYxcv2p8JMlyJGkOpymcWxbwkjGXsbTVPVWR7KE2X7Q lFcQRjaX3wlY7mjN6WgWIMVL4sLH5kCSmhTPbpe4LABBmbGJ98gFJ2yHaPlo4XuipVql ENZqtj/YGhKQcs5PtGBDOninJnm8GcuzILPGXqvcwrrXZyTEiYSGCgLaf0/AELiyo4Ke HcrWm4HIFiN8c3NBipr8FAH5T7wyMKM9nZStyDhvElODjFMTbJAVgRw0Ees9H/suBx/M 8ILw== X-Forwarded-Encrypted: i=1; AHgh+RrgEY2rIHbwv1GCKyYjVDfr2Q1iVmxTX7XcnIeAK6EWIGjdt8pzZcrfZdBPAezCXKFsrjXFuk4nw2z5r3I=@vger.kernel.org X-Gm-Message-State: AOJu0YxLKRnNhTFQjjJ3wTucFz2BOUMn8EnvwYFdogF7gtSv7zsGJWdK PnUy4eSQhH6lIy6v//1TX9ga6k9qt7sN1Qzs3WA95ioMmy0eCkMu38+MEaCwmTJoa+UnMuiSP/A nqJ6xcA== X-Received: from plbli8.prod.google.com ([2002:a17:903:2948:b0:2ce:9c01:be21]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:d54c:b0:2ce:7563:70a5 with SMTP id d9443c01a7336-2cfa71b8455mr70685705ad.6.1784854086369; Thu, 23 Jul 2026 17:48:06 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 23 Jul 2026 17:47:55 -0700 In-Reply-To: <20260724004757.131420-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: <20260724004757.131420-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260724004757.131420-5-seanjc@google.com> Subject: [PATCH 4/6] KVM: nVMX: Use CLASS(kvm_vcpu_map_local_readonly) for MSR bitmap merging From: Sean Christopherson To: Madhavan Srinivasan , Sean Christopherson , Paolo Bonzini Cc: Nicholas Piggin , linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed Content-Type: text/plain; charset="UTF-8" Convert the kvm_vcpu_map_readonly() usage in nVMX's MSR bitmap merging to the new CLASS(kvm_vcpu_map_local_readonly) implementation, to eliminate the last of the open-coded on-stack "struct kvm_host_map" declarations (in x86, PPC still has one more to convert). No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/nested.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index f2518d67e7de..ef79769c6287 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -730,7 +730,6 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct kvm_vcpu *vcpu, int msr; unsigned long *msr_bitmap_l1; unsigned long *msr_bitmap_l0 = vmx->nested.vmcs02.msr_bitmap; - struct kvm_host_map map; /* Nothing to do if the MSR bitmap is not in use. */ if (!cpu_has_vmx_msr_bitmap() || @@ -753,10 +752,11 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct kvm_vcpu *vcpu, return true; } - if (kvm_vcpu_map_readonly(vcpu, gpa_to_gfn(vmcs12->msr_bitmap), &map)) + CLASS(kvm_vcpu_map_local_readonly, m)(vcpu, gpa_to_gfn(vmcs12->msr_bitmap)); + if (m.ret) return false; - msr_bitmap_l1 = (unsigned long *)map.hva; + msr_bitmap_l1 = (unsigned long *)m.map.hva; /* * To keep the control flow simple, pay eight 8-byte writes (sixteen @@ -836,8 +836,6 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct kvm_vcpu *vcpu, nested_vmx_merge_pmu_msr_bitmaps(vcpu, msr_bitmap_l1, msr_bitmap_l0); - kvm_vcpu_unmap(vcpu, &map); - vmx->nested.force_msr_bitmap_recalc = false; return true; -- 2.55.0.229.g6434b31f56-goog