From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 7E1804779B2 for ; Fri, 29 May 2026 22:23:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780093397; cv=none; b=AXCOm9Lnk3I24cZ+JzMBLSOn2Ue8jfb2SCuwbv849yXHNJwDq9obstrqytDkQQ+xK4ZG9f4JAvxqnBhcQksYaYgjg9YKoSJVcPMlvkg5sj2h8DVk6S6OK/kEHtq0C/8ob6A8mkZXvZMt9pvR6o102qa5mqC06AFhJZxJMaHCpjA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780093397; c=relaxed/simple; bh=67zW30Fghsqm2bbgoRDmbDTWcpgL4geOGG0pkoZa+DQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZDOIPuk23kdfRjrsl0B9pkTPeSqe6bTTiAAg7GF3odYDX1/e0+76qtUSUeAscrS86PTUAoKR86BQ4ORwjuTywY6VEM7glWRycBKjTjphzm5ICvPjvQxYkCwKDLorfuloO8KqIA3lQ59f8+64F/ZD/CId0j+ieCVGrESlld2y8dY= 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=UDRA/qcI; arc=none smtp.client-ip=209.85.215.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="UDRA/qcI" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c85807671b1so307889a12.2 for ; Fri, 29 May 2026 15:23:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780093396; x=1780698196; 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=4YZDFZBCarOdxlxdCzemgJxyqnyDXT5M/adWibMWDkM=; b=UDRA/qcICcOiNfGR0SUbiJJsc437nlYOUgUzjpxZulD9/NkhKgFNeABpfvVvLDvTy7 JhvWDp/mxgGPnXgQ5BlvOyFnf241skP06E4Je2VZr1hY9bHOtA2i+QCLP5BUWMuOozSK 1wakd7SKzc50yWuXSm7vByAjfFOeL7Bv5z31KU0H0xfyWVKyHEjtpCrxCDYAwdxTHpX5 2nIrvqggvoRoDAwL7z/ORr1nmuTglOXjqD3K9Q0WdEskCaOG+RMfaS+t5ygtrzon0EC4 IZmjy91NZDoc8IJPSVQSczDHuXEY8bmHjBr4MBTC1G7oisvXUH1PiT9N8dTqCDy2oYsO q34w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780093396; x=1780698196; 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=4YZDFZBCarOdxlxdCzemgJxyqnyDXT5M/adWibMWDkM=; b=N3MbduBUaXyOkTdRXGI12bO3rZYlB4DnOAsu6JZiMTwJ+UMYhpBUGILnH3HmpFeZ3U Pr4oEkC85h/S1uh8S3xDGefr2+gtNMQOOHfmOxUGrrVYOCb6+UoZJc0z4b23xHdwpLSG FL1c7bmCYyQB6tHkVAQEbqmmfUgMK1B/DL7h9rlf5bUCZc7MHiqlgdCOrCwoTSKpbaRw jpcO254Yox1g5fOBx2f/68s0yqU0RRcBS2e1Uu+P4ysIQaGFOWiEt9jBGWi+9Kb2lyd5 DpU8bVx3gGLAGy/kRSGuVjxVY7f9ENR+QuDg+WomdARAC7OcHa5eFO+S8HnPVO0bRjmZ pTlQ== X-Forwarded-Encrypted: i=1; AFNElJ8fLIhi31Vednew9p8PVYUAn2I3pbDUainXwg4bvJZiHGOraviTpC89KQmLaKEcR6HABSbqvBTUP79KJbI=@vger.kernel.org X-Gm-Message-State: AOJu0YxpEKZKhWEgAovevGG06FxwXl8Yqy30tdYXYgBX8VXmkFhbiQgJ +7H7uWbrw6vJNyOAnVsL7fSvdHaC/x7SHtGCTkzPhhHrznsFN3f+3R5+V14zNNkXK638ujQXGhe sNiC+Vg== X-Received: from pgig5.prod.google.com ([2002:a63:f405:0:b0:c80:2399:151]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6300:189:b0:39b:89e0:2e37 with SMTP id adf61e73a8af0-3b427c23375mr1271417637.14.1780093395678; Fri, 29 May 2026 15:23:15 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 29 May 2026 15:22:10 -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-28-seanjc@google.com> Subject: [PATCH v3 27/40] KVM: x86: Move register helper declarations from kvm_host.h => regs.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 Control/Debug Register, EFLAGS and RIP helpers from x86's kvm_host.h to regs.h, to continue trimming down kvm_host.h. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_host.h | 17 ----------------- arch/x86/kvm/regs.h | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 19091d89d3cc..0f4b16b26a27 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2186,8 +2186,6 @@ void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm, u64 gen); void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned long kvm_nr_mmu_pages); void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end); -int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3); - /* * EMULTYPE_NO_DECODE - Set when re-emulating an instruction (after completing * userspace I/O) to indicate that the emulation context @@ -2313,24 +2311,12 @@ void kvm_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector); int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int idt_index, int reason, bool has_error_code, u32 error_code); -void kvm_post_set_cr0(struct kvm_vcpu *vcpu, unsigned long old_cr0, unsigned long cr0); -void kvm_post_set_cr4(struct kvm_vcpu *vcpu, unsigned long old_cr4, unsigned long cr4); -int kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0); -int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3); -int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4); -int kvm_set_cr8(struct kvm_vcpu *vcpu, unsigned long cr8); -int kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val); -unsigned long kvm_get_dr(struct kvm_vcpu *vcpu, int dr); -unsigned long kvm_get_cr8(struct kvm_vcpu *vcpu); -void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw); 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); -unsigned long kvm_get_rflags(struct kvm_vcpu *vcpu); -void kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags); int kvm_emulate_rdpmc(struct kvm_vcpu *vcpu); void kvm_queue_exception(struct kvm_vcpu *vcpu, unsigned nr); @@ -2520,9 +2506,6 @@ 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); u64 kvm_calc_nested_tsc_multiplier(u64 l1_multiplier, u64 l2_multiplier); -unsigned long kvm_get_linear_rip(struct kvm_vcpu *vcpu); -bool kvm_is_linear_rip(struct kvm_vcpu *vcpu, unsigned long linear_rip); - void kvm_make_scan_ioapic_request(struct kvm *kvm); void kvm_make_scan_ioapic_request_mask(struct kvm *kvm, unsigned long *vcpu_bitmap); diff --git a/arch/x86/kvm/regs.h b/arch/x86/kvm/regs.h index c224874bbdde..30ef08d60a74 100644 --- a/arch/x86/kvm/regs.h +++ b/arch/x86/kvm/regs.h @@ -16,6 +16,18 @@ static_assert(!(KVM_POSSIBLE_CR0_GUEST_BITS & X86_CR0_PDPTR_BITS)); +void kvm_post_set_cr0(struct kvm_vcpu *vcpu, unsigned long old_cr0, unsigned long cr0); +void kvm_post_set_cr4(struct kvm_vcpu *vcpu, unsigned long old_cr4, unsigned long cr4); +int kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0); +int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3); +int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4); +int kvm_set_cr8(struct kvm_vcpu *vcpu, unsigned long cr8); +int kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val); +unsigned long kvm_get_dr(struct kvm_vcpu *vcpu, int dr); +unsigned long kvm_get_cr8(struct kvm_vcpu *vcpu); +void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw); +int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3); + static inline bool is_long_mode(struct kvm_vcpu *vcpu) { #ifdef CONFIG_X86_64 @@ -425,7 +437,12 @@ static inline unsigned long kvm_get_segment_base(struct kvm_vcpu *vcpu, int seg) return kvm_x86_call(get_segment_base)(vcpu, seg); } +unsigned long kvm_get_linear_rip(struct kvm_vcpu *vcpu); +bool kvm_is_linear_rip(struct kvm_vcpu *vcpu, unsigned long linear_rip); + +unsigned long kvm_get_rflags(struct kvm_vcpu *vcpu); void __kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags); +void kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags); void kvm_x86_vcpu_ioctl_get_sregs2(struct kvm_vcpu *vcpu, struct kvm_sregs2 *sregs2); -- 2.54.0.823.g6e5bcc1fc9-goog