From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 3706D47A0A4 for ; Fri, 29 May 2026 22:23:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780093402; cv=none; b=J/0ps2YLiUca1yYLwsny0qa3w7t8eHsrsO7lQty+SE7ljRtEXxyhu0NxI4c9dUDNHLz2+PXdFuWyUdPzo7UKm5kjDYm6M1dnOIsQXrj1sBTU9JTA0oVulv9ZUJ6+dhHnO8tdHxXzSZc65AMQ9PNw2st8pcNHNstZbxSia3VwEGE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780093402; c=relaxed/simple; bh=otrVM3e4Lurh14D9F8StjWN8v6dvvHUUGpICOjvEYWw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ytj8rVQwQzdAdvV9o3U43wv95CWnU/jidiT/zGzwbiwDuNeyF0K0UMyRzrojZu/SOfYGbDA/ZS6sIC7fx/Cb2IsT/JsTt+FW99RmE1GEEYB4S1b0hMnrazZidgPAHw6yuoCcCzNwGJWcG60K3O9TT+sPEF48DHjTBVYHBQUGI+k= 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=EvcAoGIo; arc=none smtp.client-ip=209.85.214.201 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="EvcAoGIo" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2b99eb06178so72290785ad.2 for ; Fri, 29 May 2026 15:23:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780093399; x=1780698199; 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=U06ajxKWCrZV2qZ8Tb0oiDb/K09cySTCLuYRf+Qkq+A=; b=EvcAoGIoFlHuJMS3ugwl5wqfpaGIVpaVdmVOFsCorgSTxlv8tLKBE5Ar84UKhmSsTE dj7QyPq4jT5TNDz8cOJKND05awSpLxVMWAfC3iJGAdplGfhxRg9MZnwjpO3uhxE14Xy8 lZT82aS10F212BcnKev/dTDFVw2sUlRbjxGu1CYCerWF7nhvYLaFYRB+sFO2Xzh0xp+N i7iHfXg8eAH+PQVSR7xJ1YnK1DmWkgS+tkrD1qAiPnQpzJ9wU3lzXiAJGEjvO9J2ZWoq gdbgWVFY9m2GpUw+qj2Db0+Ry/0y5OcXTuvVrNFcUur0fbdLPzEeB+2QHOu1embOCt5K 1+RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780093399; x=1780698199; 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=U06ajxKWCrZV2qZ8Tb0oiDb/K09cySTCLuYRf+Qkq+A=; b=lDa9whpyiFcOycDrMp99rwZ0i8GT9pzr88t7I2MzEfbyvmkfifOHoVZk7g+O2WU8Cf jDzJZtbp0FxrSoX0+QQ+bc9QwBdmEblcoaY15z6cSYOgX/6tzEkPmblSnR0Km2KDyfPv SCDcDA1eM6TGAk3VYMaSlzCWYSU30rI0FJ9AaL/X8968sFRqnoVDiGipqhvI+1TKJtOO 6mAIiPwXWQX/LUoPmtMNof4q3Hd7oDwin+QoqrrhXdLgZ0iwSuq1Hhm1Ix0TSAh4+65M 17+YY+0VGlh6jo4C7tOeN0xQa+X83KjxxzjkHYpPC58BAqZchdtMxx1L8/j3UVgBNg8D STmA== X-Forwarded-Encrypted: i=1; AFNElJ/OKvpwDiW6TpRy8fiWEcj9R6SwHg18zoiqzG/ZsSyeb9x15OLgxppdFUY3geAY28l9JoEkyvKGQTx7NAI=@vger.kernel.org X-Gm-Message-State: AOJu0YyVnyvKmj5BAcplIu2FnMm+xYF7+gGuZDFOOYBDWcwb+4nSKwOz Ea2WH2nc9nv/1ZKGdp93mBBhwPC8FrEvBDasdxHarMTtEDK/VXZr9484oFU1crp52nAKxq7UtkP zuRTF0A== X-Received: from plav13.prod.google.com ([2002:a17:902:f0cd:b0:2bf:25c4:45ec]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:138a:b0:2b4:5f69:715d with SMTP id d9443c01a7336-2bf36809d00mr21727735ad.25.1780093399437; Fri, 29 May 2026 15:23:19 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 29 May 2026 15:22:13 -0700 In-Reply-To: <20260529222223.870923-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: <20260529222223.870923-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.823.g6e5bcc1fc9-goog Message-ID: <20260529222223.870923-31-seanjc@google.com> Subject: [PATCH v3 30/40] KVM: x86: Move MSR helper declarations from kvm_host.h => msrs.h From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov , David Woodhouse , Paul Durrant Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed , Binbin Wu , David Woodhouse , Kai Huang Content-Type: text/plain; charset="UTF-8" Relocate declarations of MSR helpers (and kvm_nr_uret_msrs) from x86's x86's kvm_host.h to msrs, to continue trimming down kvm_host.h. Deliberately leave the funky read_msr() where it is, as it will hopefully be removed entirely as part of a broader kernel-API cleanup. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_host.h | 26 ------------------------- arch/x86/kvm/msrs.h | 34 ++++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index a861c0d70be0..1143140592df 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2094,7 +2094,6 @@ struct kvm_arch_async_pf { u64 error_code; }; -extern u32 __read_mostly kvm_nr_uret_msrs; extern bool __read_mostly allow_smaller_maxphyaddr; extern bool __read_mostly enable_apicv; extern bool __read_mostly enable_ipiv; @@ -2278,18 +2277,6 @@ void kvm_prepare_emulation_failure_exit(struct kvm_vcpu *vcpu); void kvm_prepare_event_vectoring_exit(struct kvm_vcpu *vcpu, gpa_t gpa); void kvm_prepare_unexpected_reason_exit(struct kvm_vcpu *vcpu, u64 exit_reason); -void kvm_enable_efer_bits(u64); -bool kvm_valid_efer(struct kvm_vcpu *vcpu, u64 efer); -int kvm_emulate_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data); -int kvm_emulate_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data); -int __kvm_emulate_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data); -int __kvm_emulate_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data); -int kvm_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data); -int kvm_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data); -int kvm_emulate_rdmsr(struct kvm_vcpu *vcpu); -int kvm_emulate_rdmsr_imm(struct kvm_vcpu *vcpu, u32 msr, int reg); -int kvm_emulate_wrmsr(struct kvm_vcpu *vcpu); -int kvm_emulate_wrmsr_imm(struct kvm_vcpu *vcpu, u32 msr, int reg); int kvm_emulate_as_nop(struct kvm_vcpu *vcpu); int kvm_emulate_invd(struct kvm_vcpu *vcpu); int kvm_emulate_mwait(struct kvm_vcpu *vcpu); @@ -2311,9 +2298,6 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int idt_index, int __kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr); int kvm_emulate_xsetbv(struct kvm_vcpu *vcpu); -int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr); -int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr); - int kvm_emulate_rdpmc(struct kvm_vcpu *vcpu); void kvm_queue_exception(struct kvm_vcpu *vcpu, unsigned nr); @@ -2488,16 +2472,6 @@ int kvm_pv_send_ipi(struct kvm *kvm, unsigned long ipi_bitmap_low, unsigned long ipi_bitmap_high, u32 min, unsigned long icr, int op_64_bit); -int kvm_add_user_return_msr(u32 msr); -int kvm_find_user_return_msr(u32 msr); -int kvm_set_user_return_msr(unsigned index, u64 val, u64 mask); -u64 kvm_get_user_return_msr(unsigned int slot); - -static inline bool kvm_is_supported_user_return_msr(u32 msr) -{ - return kvm_find_user_return_msr(msr) >= 0; -} - u64 kvm_scale_tsc(u64 tsc, u64 ratio); u64 kvm_read_l1_tsc(struct kvm_vcpu *vcpu, u64 host_tsc); u64 kvm_calc_nested_tsc_offset(u64 l1_offset, u64 l2_offset, u64 l2_multiplier); diff --git a/arch/x86/kvm/msrs.h b/arch/x86/kvm/msrs.h index c34f0411ced6..5c8362a8fd97 100644 --- a/arch/x86/kvm/msrs.h +++ b/arch/x86/kvm/msrs.h @@ -11,6 +11,8 @@ extern bool report_ignored_msrs; extern bool ignore_msrs; +extern u32 __read_mostly kvm_nr_uret_msrs; + static inline void kvm_pr_unimpl_wrmsr(struct kvm_vcpu *vcpu, u32 msr, u64 data) { if (report_ignored_msrs) @@ -56,13 +58,39 @@ int kvm_get_set_one_reg(struct kvm_vcpu *vcpu, unsigned int ioctl, int kvm_get_reg_list(struct kvm_vcpu *vcpu, struct kvm_reg_list __user *user_list); +void kvm_enable_efer_bits(u64); +bool kvm_valid_efer(struct kvm_vcpu *vcpu, u64 efer); +int kvm_emulate_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data); +int kvm_emulate_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data); +int __kvm_emulate_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data); +int __kvm_emulate_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data); +int kvm_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data); +int kvm_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data); +int kvm_emulate_rdmsr(struct kvm_vcpu *vcpu); +int kvm_emulate_rdmsr_imm(struct kvm_vcpu *vcpu, u32 msr, int reg); +int kvm_emulate_wrmsr(struct kvm_vcpu *vcpu); +int kvm_emulate_wrmsr_imm(struct kvm_vcpu *vcpu, u32 msr, int reg); + +fastpath_t handle_fastpath_wrmsr(struct kvm_vcpu *vcpu); +fastpath_t handle_fastpath_wrmsr_imm(struct kvm_vcpu *vcpu, u32 msr, int reg); + +int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr); +int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr); + +int kvm_add_user_return_msr(u32 msr); +int kvm_find_user_return_msr(u32 msr); +int kvm_set_user_return_msr(unsigned index, u64 val, u64 mask); +u64 kvm_get_user_return_msr(unsigned int slot); + +static inline bool kvm_is_supported_user_return_msr(u32 msr) +{ + return kvm_find_user_return_msr(msr) >= 0; +} + void kvm_user_return_msr_cpu_online(void); void drop_user_return_notifiers(void); void kvm_destroy_user_return_msrs(void); -fastpath_t handle_fastpath_wrmsr(struct kvm_vcpu *vcpu); -fastpath_t handle_fastpath_wrmsr_imm(struct kvm_vcpu *vcpu, u32 msr, int reg); - int kvm_emulator_get_msr_with_filter(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata); int kvm_emulator_set_msr_with_filter(struct kvm_vcpu *vcpu, u32 msr_index, -- 2.54.0.823.g6e5bcc1fc9-goog