From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 B75412E7BD4 for ; Thu, 16 Oct 2025 22:28:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760653710; cv=none; b=crFz7fVODwnO4Q5iiFcxO6L9nM87Xwxn4O7C4zA5zapFDi1F0kDnnZIvWfJ7jQrIOETJ5B5pP3X8VlkJmuFFZfafHqi9kwsWn6ASZKtbCwHDJHsOvn350RCgSSKQT6ktK2p3x0Qve0OrrU0s43OPgG9UIxv7oslPZKenZefdXH0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760653710; c=relaxed/simple; bh=oY878RYH2mslJwg0qdtPgRwIaldHQ7WLLqDkmC1ip5g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=j5LeEskR9rhYNS6PHGofmRb0KofHMvbdCVIIf4B8v/ECJvPzy1RSuD9KHA6JIcBTKFGFPBr4Suo3h2jN8bUOTwGZe9a3VtZ0raiaN7PvOBV55A7vxKprfbj1lxw5jaIpKVl8uY6/lk25oPsFYciIQRDO7c0T55KnamkmgL6wD/E= 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=Is0O8dXC; arc=none smtp.client-ip=209.85.216.74 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="Is0O8dXC" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3352a336ee1so2753539a91.0 for ; Thu, 16 Oct 2025 15:28:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1760653708; x=1761258508; darn=lists.linux.dev; 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=sod+h68sOef8XvTYH5hL66cOeE3tT8hv2lEauZbhw70=; b=Is0O8dXCMcPXnEqM6DZ2DdT3IwpnIvkR/JgyOWgVG5D5Z7ZLnI2fS8oIBcxoR292FD FNOPCqh/viHpZjg3F+u/hwcKCd9Vs8YDckIX7s03tHWIue4Q++XTJtimGGrrstQQhO2W ZOHUzPGN/O/X9IqpLAyjmUhUhnNSde53Nika3tjCuv1GZSBMhme/sW3gE98+LtSoUJ0p j5JfLAiPEFpjKXcmFh0V2wt2+zGlrgrO5yJombjCiLUshmrpasuvuMo+mNuHW3h4kBuU 3RCVOrUO09Vumsomv5CT3T/xZ0c3r4dlipZtKRm9FcxydDhjbfYPwEwKr/MaT1EoCzdX Agdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760653708; x=1761258508; 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=sod+h68sOef8XvTYH5hL66cOeE3tT8hv2lEauZbhw70=; b=QqvupmlvAO9qF8Ezni7Iup81BlfW+cbxRYb7Iad91TkNgrKtH+McWNC6JKDB0fzXBv IkOB1QwMLrNoUN65RyrEXHImA3FTxtD4s4y1+ACrfkUq/2dcm6IX0Yprf9SNo8nGutj2 fDyG/y3s2Z3XIqdcmylJg6nx+Yek9cxUy3nGc47/4Q/GQuT3ObIoB7IXKQJiwfBbafdx x2C/C3zFjngXN/yIBJf+eUmOK+g78eLy13f75O+vtizSkj79GL22qiWhF/m61E95A0mq mA8UbrCET9X/8dFpVCH/ggCjX+77FOSixC2wQAd1X37+694YgfyvX6UYC/RuY+BZi9EW pQhg== X-Forwarded-Encrypted: i=1; AJvYcCUorLNyQ0Q8MOUgnX+Z/ImptBixr5UBb28OPoyfRxBn4qZaOaBPTcM8HThAdRuQ9UYJtJ0cwMCDvjgr@lists.linux.dev X-Gm-Message-State: AOJu0Yy+ejfHOT30rfSJdULWsKuiG8pUruAv0iN01UBpKsgTKp8+4vEL /CFM2VVSq42Voy1w3A2f+5LLg4akjsMg9PZUaFdQG3F91GoLJ2TRMRhyXlDp8c0kArPTTlwhi4t hTdvBHg== X-Google-Smtp-Source: AGHT+IEwdDYnEGjMumhEIrDhiWelgfr9l1shpL6etMLfOeb3DaDY5Ntm6comWTq6+d8o1CvS2P0n7vWtfUo= X-Received: from pjbhi22.prod.google.com ([2002:a17:90b:30d6:b0:33b:51fe:1a83]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1c89:b0:32e:7bbc:bf13 with SMTP id 98e67ed59e1d1-33bcf91b83bmr1495993a91.34.1760653707913; Thu, 16 Oct 2025 15:28:27 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 16 Oct 2025 15:28:16 -0700 In-Reply-To: <20251016222816.141523-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251016222816.141523-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.858.gf9c4a03a3a-goog Message-ID: <20251016222816.141523-5-seanjc@google.com> Subject: [PATCH v4 4/4] KVM: x86: Drop "cache" from user return MSR setter that skips WRMSR From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , "Kirill A. Shutemov" Cc: kvm@vger.kernel.org, x86@kernel.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, Yan Zhao , Xiaoyao Li , Rick Edgecombe , Hou Wenlong Content-Type: text/plain; charset="UTF-8" Rename kvm_user_return_msr_update_cache() to __kvm_set_user_return_msr() and use the helper in kvm_set_user_return_msr() to make it obvious that the double-underscores version is doing a subset of the work of the "full" setter. While the function does indeed update a cache, the nomenclature is slightly misleading now that there is a "get" helper (see commit 9bc366350734 ("KVM: x86: Add helper to retrieve current value of user return MSR"), as the current value isn't _just_ the cached value, it's also the value that's currently loaded in hardware (modulo the fact that writing .curr and the actual MSR isn't atomic and may have significant "delays" in certain setups). Opportunistically rename "index" to "slot" in the prototypes. The user- return APIs deliberately use "slot" to try and make it more obvious that they take the slot within the array, not the index of the MSR. Opportunistically tweak the local TDX helper to drop "cache" from its name and to use "sync" instead of "update", so that it's more obvious the goal is to sync (with hardware), versus doing some arbitrary update. No functional change intended. Cc: Rick Edgecombe Reviewed-by: Xiaoyao Li Reviewed-by: Yan Zhao Link: https://lore.kernel.org/all/aM2EvzLLmBi5-iQ5@google.com [1] Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_host.h | 4 ++-- arch/x86/kvm/vmx/tdx.c | 10 +++++----- arch/x86/kvm/x86.c | 21 ++++++++++----------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 48598d017d6f..dc2476f25c75 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2377,8 +2377,8 @@ int kvm_pv_send_ipi(struct kvm *kvm, unsigned long ipi_bitmap_low, 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); -void kvm_user_return_msr_update_cache(unsigned int index, u64 val); +int kvm_set_user_return_msr(unsigned int slot, u64 val, u64 mask); +void __kvm_set_user_return_msr(unsigned int slot, u64 val); u64 kvm_get_user_return_msr(unsigned int slot); static inline bool kvm_is_supported_user_return_msr(u32 msr) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 2f3dfe9804b5..b7e2957d53d9 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -803,13 +803,13 @@ static struct tdx_uret_msr tdx_uret_msrs[] = { {.msr = MSR_TSC_AUX,}, }; -static void tdx_user_return_msr_update_cache(void) +static void tdx_sync_user_return_msrs(void) { int i; for (i = 0; i < ARRAY_SIZE(tdx_uret_msrs); i++) - kvm_user_return_msr_update_cache(tdx_uret_msrs[i].slot, - tdx_uret_msrs[i].defval); + __kvm_set_user_return_msr(tdx_uret_msrs[i].slot, + tdx_uret_msrs[i].defval); } static void tdx_prepare_switch_to_host(struct kvm_vcpu *vcpu) @@ -1063,7 +1063,7 @@ fastpath_t tdx_vcpu_run(struct kvm_vcpu *vcpu, u64 run_flags) tdx_load_host_xsave_state(vcpu); if (tdx->need_user_return_msr_sync) { - tdx_user_return_msr_update_cache(); + tdx_sync_user_return_msrs(); tdx->need_user_return_msr_sync = false; } @@ -3446,7 +3446,7 @@ static int __init __tdx_bringup(void) * * this_cpu_ptr(user_return_msrs)->registered isn't checked * because the registration is done at vcpu runtime by - * tdx_user_return_msr_update_cache(). + * tdx_sync_user_return_msrs(). */ tdx_uret_msrs[i].slot = kvm_find_user_return_msr(tdx_uret_msrs[i].msr); if (tdx_uret_msrs[i].slot == -1) { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 394a30bb33da..68daf94e0deb 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -655,6 +655,15 @@ static void kvm_user_return_register_notifier(struct kvm_user_return_msrs *msrs) } } +void __kvm_set_user_return_msr(unsigned int slot, u64 value) +{ + struct kvm_user_return_msrs *msrs = this_cpu_ptr(user_return_msrs); + + msrs->values[slot].curr = value; + kvm_user_return_register_notifier(msrs); +} +EXPORT_SYMBOL_GPL(__kvm_set_user_return_msr); + int kvm_set_user_return_msr(unsigned slot, u64 value, u64 mask) { struct kvm_user_return_msrs *msrs = this_cpu_ptr(user_return_msrs); @@ -667,21 +676,11 @@ int kvm_set_user_return_msr(unsigned slot, u64 value, u64 mask) if (err) return 1; - msrs->values[slot].curr = value; - kvm_user_return_register_notifier(msrs); + __kvm_set_user_return_msr(slot, value); return 0; } EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_set_user_return_msr); -void kvm_user_return_msr_update_cache(unsigned int slot, u64 value) -{ - struct kvm_user_return_msrs *msrs = this_cpu_ptr(user_return_msrs); - - msrs->values[slot].curr = value; - kvm_user_return_register_notifier(msrs); -} -EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_user_return_msr_update_cache); - u64 kvm_get_user_return_msr(unsigned int slot) { return this_cpu_ptr(user_return_msrs)->values[slot].curr; -- 2.51.0.858.gf9c4a03a3a-goog