From nobody Sun Apr 5 13:12:44 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 3259B318EDD for ; Wed, 18 Feb 2026 08:22:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771402921; cv=none; b=kjEnQ/nAKfXUeRv+vGZ9pM3ptcN3N/RQlE1xZiK6SP4SI6DY1xmWn4BYtB9Ok5zY8pqEdjdrxFIzx4LQXiFgKXMEgpcrMxGl8Z2zHClVJnFXyFIzzk2xf9/Vyt7qBF1DqylQ2l9ZALKAiUIoZOJPFWb0WXvUmUS0TPLTVv7tqj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771402921; c=relaxed/simple; bh=TH3DH5sZ3YyRQn+6E5BlnD/gSVwnhrm79PHvlpsEKiQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mUsSTOwIT2iJyttUiuV6r37/1ggrfr/Y9vAHZMO2cGhf9L9s2qYtmotFhyYTH4SA0OzXSKcs3v7r/hiYSneQaFeWLfSp1T3+Wfs5lPrcqXGTe7mPjZplTqdD6khyaIO1hL7Uh15/ClMv9nbg5AtenmC5jPCAAZaF//cAZ36JBJ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=LxzG3ESO; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=LxzG3ESO; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="LxzG3ESO"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="LxzG3ESO" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9597F5BCCC; Wed, 18 Feb 2026 08:21:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1771402918; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pu+C5dLQu/zzPEFzF00OQIZX29gA4v0cXo/52IprP4w=; b=LxzG3ESOgat3VqxxKOzEShuCAKqlv1ZCdstEbXVdOTndy+wHsGw1C+YomfAUSFl4B3byGH k0q4zkkQr3q93tR7l1c4SetJEJu1grJKgfLaSStRRFZlIrLrJ1IEyLMduNRZ5+ivsX6zMP NH15wDHHoQQQc0kXodAZPya6VeWS7AI= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1771402918; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pu+C5dLQu/zzPEFzF00OQIZX29gA4v0cXo/52IprP4w=; b=LxzG3ESOgat3VqxxKOzEShuCAKqlv1ZCdstEbXVdOTndy+wHsGw1C+YomfAUSFl4B3byGH k0q4zkkQr3q93tR7l1c4SetJEJu1grJKgfLaSStRRFZlIrLrJ1IEyLMduNRZ5+ivsX6zMP NH15wDHHoQQQc0kXodAZPya6VeWS7AI= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 3CE2B3EA65; Wed, 18 Feb 2026 08:21:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id EKTVDaZ2lWldHgAAD6G6ig (envelope-from ); Wed, 18 Feb 2026 08:21:58 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org, linux-coco@lists.linux.dev Cc: Juergen Gross , Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Kiryl Shutsemau , Rick Edgecombe Subject: [PATCH v3 04/16] KVM: x86: Remove the KVM private read_msr() function Date: Wed, 18 Feb 2026 09:21:21 +0100 Message-ID: <20260218082133.400602-5-jgross@suse.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260218082133.400602-1-jgross@suse.com> References: <20260218082133.400602-1-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -6.80 X-Spam-Level: X-Spamd-Result: default: False [-6.80 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:mid,suse.com:email,imap1.dmz-prg2.suse.org:helo]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCPT_COUNT_TWELVE(0.00)[14]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; R_RATELIMIT(0.00)[to_ip_from(RLfdszjqhz8kzzb9uwpzdm8png)]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO Content-Type: text/plain; charset="utf-8" Instead of having a KVM private read_msr() function, just use rdmsrq(). Signed-off-by: Juergen Gross Reviewed-by: H. Peter Anvin (Intel) Acked-by: Sean Christopherson Reviewed-by: Rick Edgecombe --- V2: - remove the helper and use rdmsrq() directly (Sean Christopherson) --- arch/x86/include/asm/kvm_host.h | 10 ---------- arch/x86/kvm/vmx/tdx.c | 2 +- arch/x86/kvm/vmx/vmx.c | 6 +++--- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_hos= t.h index ff07c45e3c73..9034222a96e8 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2347,16 +2347,6 @@ static inline void kvm_load_ldt(u16 sel) asm("lldt %0" : : "rm"(sel)); } =20 -#ifdef CONFIG_X86_64 -static inline unsigned long read_msr(unsigned long msr) -{ - u64 value; - - rdmsrq(msr, value); - return value; -} -#endif - static inline void kvm_inject_gp(struct kvm_vcpu *vcpu, u32 error_code) { kvm_queue_exception_e(vcpu, GP_VECTOR, error_code); diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 5df9d32d2058..d9e371e39853 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -801,7 +801,7 @@ void tdx_prepare_switch_to_guest(struct kvm_vcpu *vcpu) if (likely(is_64bit_mm(current->mm))) vt->msr_host_kernel_gs_base =3D current->thread.gsbase; else - vt->msr_host_kernel_gs_base =3D read_msr(MSR_KERNEL_GS_BASE); + rdmsrq(MSR_KERNEL_GS_BASE, vt->msr_host_kernel_gs_base); =20 vt->guest_state_loaded =3D true; =20 diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 967b58a8ab9d..3799cbbb4577 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -1403,8 +1403,8 @@ void vmx_prepare_switch_to_guest(struct kvm_vcpu *vcp= u) } else { savesegment(fs, fs_sel); savesegment(gs, gs_sel); - fs_base =3D read_msr(MSR_FS_BASE); - vt->msr_host_kernel_gs_base =3D read_msr(MSR_KERNEL_GS_BASE); + rdmsrq(MSR_FS_BASE, fs_base); + rdmsrq(MSR_KERNEL_GS_BASE, vt->msr_host_kernel_gs_base); } =20 wrmsrq(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base); @@ -1463,7 +1463,7 @@ static u64 vmx_read_guest_host_msr(struct vcpu_vmx *v= mx, u32 msr, u64 *cache) { preempt_disable(); if (vmx->vt.guest_state_loaded) - *cache =3D read_msr(msr); + rdmsrq(msr, *cache); preempt_enable(); return *cache; } --=20 2.53.0