From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C490C87FD3 for ; Wed, 6 Aug 2025 21:45:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To: From:Subject:Message-ID:References:Mime-Version:In-Reply-To:Date: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0uQwWV7lYMOxBil53zyDkn96gfX2tt2/DqWsDrl/9hs=; b=VpdptbqktBiHVVbFM+Gwy27pfq FaH+c7fWmXQLGJis3Wx8mWe0x/H1gu5vU4feKg6/Z6Ij6T+eToRMcp00P8O7xINHwq62wwlvhgk9w j4gQrCracsv/xxuAamOEkQATGt3QgraOqTIvIYETi+XOAThLI8Ig/F1Wbb/MgbblXIxNmBmcs4rZS W+M3HMJElGrQ3QcLHi5hmMPA2zXs/PqdcjVeURwdyJHXVt8DvxwhimuIMjbDKd5xYLEwy3YT623U3 dhj0msiJHZ8Ulpr89yz+ALg4xterWtZRtWHT6tJg7EAapZYs4IFmQq0Am5OZj3GgC7rTNwBC++Sif hkJruNog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ujlwN-0000000Gc8g-41JJ; Wed, 06 Aug 2025 21:44:56 +0000 Received: from mail-pl1-x64a.google.com ([2607:f8b0:4864:20::64a]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1ujkGp-0000000GGOw-1g6k for linux-arm-kernel@lists.infradead.org; Wed, 06 Aug 2025 19:57:57 +0000 Received: by mail-pl1-x64a.google.com with SMTP id d9443c01a7336-2400a0ad246so1471195ad.2 for ; Wed, 06 Aug 2025 12:57:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1754510274; x=1755115074; darn=lists.infradead.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=0uQwWV7lYMOxBil53zyDkn96gfX2tt2/DqWsDrl/9hs=; b=MYvvQAf5hNTIHqJrf0uNqUg3j7PVQN02RFJ0LRY0SZktB+EoNM6kWHH71jydVBycev C9AD4tu1jCcxWb5qlrKztTEEot6IvuhuUgGiXldUZVfoHarlqURz3OkVkhT1qt9o5MEb dxu62LftXc1CoU5KFYxnsRw1QxOZOo9uwglhvXF90loXJWsW7zOujzuX9o11H85qpgxY Hc8uW/Un02xGmv+uSlenKchr6QU1+KOqJKG6bt270EwDsXLkjW1OXM5yJBaDdRECs48I Q9Wp+cqoF8bko3hXqB3NJ7s8goRTF6enbGqKg3Jnl/b+QWLuw3rrJeDfOqru4+4S9ps0 P0JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754510274; x=1755115074; 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=0uQwWV7lYMOxBil53zyDkn96gfX2tt2/DqWsDrl/9hs=; b=igUlO7NhHTw+cK5oZlBp+DhF1do8J3fA88CIHppiuHYmDx7jrrLNYSqcLz+9quYwge 4oggDgISWKir0/hyovGVRtYn46NYa5Y7TYpaxfPosz+sES07pv2P4A0ZBF3HsP+zP0F5 0H3HWvDdb5xqBi2GqdjP7lrTgJfHIKG4F7Zn5JnpqgDbAo0ue53wvWgyUY4WGT59IEMd BBclEku7oRIWx4hduzAdEeMQtwNl/WvHdxYf2s3L7UrAzN8qIHMq6cFILNxg8gxG06fQ oiiu4XJ1VzHU/mIjdtl0aHFAIqCCMHr8p2NXVw1zm3PCD87zA+0H9HSLutuGdf7Q/lAT jotQ== X-Gm-Message-State: AOJu0Yw9Mxvz0K3Xk3og21vLGLMYUMEPWTjCpEdg0krM+ZckkwedLEWd BEFsTGk9qdgbmgu+s7ZpR1dEEn7KlN+c9EPcWsC3f3SY1PQzm/2vNbYZefRpGDwlGofO9wb6QMy gytLm7A== X-Google-Smtp-Source: AGHT+IGH2b2xUlwmCehGLeN80BLd5ICkd9hx9VxyJMjC6VJA8pJue1wqM8eYOcrMqHKsQHTGrwNwqHX4jyM= X-Received: from plkh12.prod.google.com ([2002:a17:903:19ec:b0:240:9ca:fc49]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ce05:b0:240:49d1:6347 with SMTP id d9443c01a7336-2429f30b512mr54270245ad.35.1754510274358; Wed, 06 Aug 2025 12:57:54 -0700 (PDT) Date: Wed, 6 Aug 2025 12:56:36 -0700 In-Reply-To: <20250806195706.1650976-1-seanjc@google.com> Mime-Version: 1.0 References: <20250806195706.1650976-1-seanjc@google.com> X-Mailer: git-send-email 2.50.1.565.gc32cd1483b-goog Message-ID: <20250806195706.1650976-15-seanjc@google.com> Subject: [PATCH v5 14/44] KVM: VMX: Setup canonical VMCS config prior to kvm_x86_vendor_init() From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Xin Li , "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Kan Liang , Yongwei Ma , Mingwei Zhang , Xiong Zhang , Sandipan Das , Dapeng Mi Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250806_125755_447526_85FCB90C X-CRM114-Status: GOOD ( 16.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Sean Christopherson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Setup the golden VMCS config during vmx_init(), before the call to kvm_x86_vendor_init(), instead of waiting until the callback to do hardware setup. setup_vmcs_config() only touches VMX state, i.e. doesn't poke anything in kvm.ko, and has no runtime dependencies beyond hv_init_evmcs(). Setting the VMCS config early on will allow referencing VMCS and VMX capabilities at any point during setup, e.g. to check for PERF_GLOBAL_CTRL save/load support during mediated PMU initialization. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/vmx.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 95765db52992..ed10013dac95 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -8335,8 +8335,6 @@ __init int vmx_hardware_setup(void) vmx_setup_user_return_msrs(); - if (setup_vmcs_config(&vmcs_config, &vmx_capability) < 0) - return -EIO; if (boot_cpu_has(X86_FEATURE_NX)) kvm_enable_efer_bits(EFER_NX); @@ -8560,11 +8558,18 @@ int __init vmx_init(void) return -EOPNOTSUPP; /* - * Note, hv_init_evmcs() touches only VMX knobs, i.e. there's nothing - * to unwind if a later step fails. + * Note, VMCS and eVMCS configuration only touch VMX knobs/variables, + * i.e. there's nothing to unwind if a later step fails. */ hv_init_evmcs(); + /* + * Parse the VMCS config and VMX capabilities before anything else, so + * that the information is available to all setup flows. + */ + if (setup_vmcs_config(&vmcs_config, &vmx_capability) < 0) + return -EIO; + r = kvm_x86_vendor_init(&vt_init_ops); if (r) return r; -- 2.50.1.565.gc32cd1483b-goog