From nobody Thu Apr 2 20:10:52 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8044C42EEB4 for ; Thu, 26 Mar 2026 18:18:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774549114; cv=none; b=VGABmwZ+G/Rlfqwou4qqnGYAw2MWUJIjyxHR+H2PYFmD0cBaO4uLhOIxARMoRD3F+OCg4cuxmbSUlOwjJOc0mNsNXCRYujDfjIHMjHf4FYHfVIGJZLx9YYHZx3sx5ZmW5S8nQeHaFXRBYkMb42sn2gKpNM1RH00urfYASQKCsCk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774549114; c=relaxed/simple; bh=KyJghWuDVBsbgkhZkBaY+oSIj/LbtZ/LGaEKZV/V7ZQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oeCOpI4ubp3GkC4+gdZvSLU7XRgExNZTE7bQO7v+yJxEfHhEoXAgzWMlUZoNzCKVqrvjnTsdBuVPJoRvU3X/X0zasfoNjVv9doa4vpT8LGOZD0e9pfXiyh/WyheZfho0HqABeGDSDbkOxaxhMstwrobLUSJwg8UmlghWZQpGMAc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=E7x7R6Np; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=Ltb3BX/x; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="E7x7R6Np"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ltb3BX/x" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774549112; h=from:from:reply-to:subject:subject: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=EJv4bFxkGZXT+fQXF05wmQFYDvr/WaoBBgiyg84ew/A=; b=E7x7R6NpyY7GFdXGD/uUUSKZ1zgCn4QK7MJOTv1gcyLxkKNlp1By8qXieP95ZuloAMKm+B Us1DRaK2TZuruV3qrIqpyRokiHPR3gomD70ZqdcUXFJ0zZtaHZGaA238AnnFmD0ZXMu0eM CZl0J4LjQlD4+dMIx1nNCfRnp2aE9ys= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-689-N9yk59omOWOPebe4PgK68A-1; Thu, 26 Mar 2026 14:18:31 -0400 X-MC-Unique: N9yk59omOWOPebe4PgK68A-1 X-Mimecast-MFC-AGG-ID: N9yk59omOWOPebe4PgK68A_1774549110 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-486f830f4e4so833765e9.1 for ; Thu, 26 Mar 2026 11:18:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774549110; x=1775153910; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EJv4bFxkGZXT+fQXF05wmQFYDvr/WaoBBgiyg84ew/A=; b=Ltb3BX/xa0mGZtjv0sXsj56ix2jvd4VAM1ItB4z8W7g9/YDIXLrIl/8Iub+s0jtk7d VdldVAJVuRphPc236uu+f+BdjgOf5psgTTS0tuOD34vlDG3xiRZMkeKv/qVHIwmx2jQH LVj0xpYnFj+2Sv1PqUufHP23vbDzytTAsb5zWivWbMyCv09OJGR9XEHjseB9A3wWWc7M lilnhNwNwPKcqVjhR5nDDunuene2byBjVqwfKl12lBizxzGpRkJRrZv+sV91J2tuCIPD jhd14u6vM5Kc54gWczdokeM7pkWp+6Ad/UFHYgR7Kzo5F0ruMJqo/JkNDDWr1SNaPagi sLWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774549110; x=1775153910; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=EJv4bFxkGZXT+fQXF05wmQFYDvr/WaoBBgiyg84ew/A=; b=PZjMIpKe2hp3JI88e+o5ZbmNqtEaxQU6Qhze0VycRldCp5laJKNHlSeyE0AzTeMPar XTboR7tTkGW5W4YdheYcygOpSrG4PtOGcEw5zSN/KDn5Xs2ftv+IzMswCcehLyHYBiD0 tBb+S90IEsuqJjw1q95reeib4l/JA5l/86LyBTPkxy3CxJnRmJWGwGgrQAM6WIuK5b5o oBsVS4lKLCwosREnAF8IQXJUzKUgFJBweS4wk+ZGnCYrsAKXWhetUWMF6CdWQl1BVdCK yHfsOTuFjq20PbP0eKmKLVHfFFgMK7wly5cPsLAkNM7OnbFaH3J0mCc84XMaeuqh3qeh U6WA== X-Gm-Message-State: AOJu0Yz45mWoWQsQ7vmK4kQqT8GB56mJW4Wb8DuFyYEJ60V8WIY7yKux APSTXJ1fqYK6+mFwbY5AHCcQyyZNbjja/Sz2BQp1ROU7JiWR29I9utpRlHCDsptiw5jX8ZsBbgl ZCq/8/V8KgsYT82Y1k+QIQ/5cOfmXR8T4U4EtnsANlCEWp7F82I/PDccrrhYAKoEk+YTIXYP1DD Wk2WeUuY5OYrOMBV7dTU5WcwwV5S9/zMXtbIl4l3FtMPbX7oHQWw== X-Gm-Gg: ATEYQzygq+2Aqh21p2cWfjRavMLqOQoPJL8qOtH9Sfs3Pva9KoLM+wtuWkt218AkAzW uYAoZIeV1rLvuhDGImnNyNInvAXrdNtXvG+I+T3OExNyv85zBECg3pXO/aGWXR4EYz5M3eH3a0R MS3PZNef/U6SlSqXZVYR/rAuB8sb7Mx+dX3w7rq26wO3kTLGi5km4j60GLX0pLQ6SdJ03VKYD44 dP6qMHKi8YdJ+OlmpEp2xT3uLO1+vrb9b3imafdLeZxHQ0pB3YssAomdNEGPzGgewENBHNe1Hdk 0uz2OpnMbfGszL5pz/fxzl5Qb2HLHWhvdkOdzGIk1OW/l+ojN4+HVOsy/zjIr2qOZAkSNrsoduh DNJKkPuFy5xbCO1MZ5ueZWI+YdBT59wpYngsPzCnXyEFqU0Oj7wMrHPqCdDWeaOhq8IchF/Yfkl xZuz92i4IbX1nMYU1a8Pa6EU0g X-Received: by 2002:a05:600c:4685:b0:483:6a8d:b2f9 with SMTP id 5b1f17b1804b1-48715fc3994mr129405795e9.5.1774549109949; Thu, 26 Mar 2026 11:18:29 -0700 (PDT) X-Received: by 2002:a05:600c:4685:b0:483:6a8d:b2f9 with SMTP id 5b1f17b1804b1-48715fc3994mr129405095e9.5.1774549109381; Thu, 26 Mar 2026 11:18:29 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48722c6b495sm102069845e9.2.2026.03.26.11.18.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 11:18:28 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Jon Kohler , Nikunj A Dadhania , Amit Shah , Sean Christopherson , Marcelo Tosatti Subject: [PATCH 24/24] KVM: nSVM: enable GMET for guests Date: Thu, 26 Mar 2026 19:17:22 +0100 Message-ID: <20260326181723.218115-25-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260326181723.218115-1-pbonzini@redhat.com> References: <20260326181723.218115-1-pbonzini@redhat.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 Content-Type: text/plain; charset="utf-8" All that needs to be done is moving the GMET bit from vmcs12 to vmcs02. The only new thing is that __nested_svm_check_controls now ensures that ignored-if-unavailable bits are zero in svm->nested.ctl. Signed-off-by: Paolo Bonzini --- arch/x86/kvm/svm/nested.c | 6 ++++++ arch/x86/kvm/svm/svm.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 4c7bc0e7f908..235477bac7e7 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -343,6 +343,8 @@ static bool nested_svm_check_bitmap_pa(struct kvm_vcpu = *vcpu, u64 pa, u32 size) static bool __nested_vmcb_check_controls(struct kvm_vcpu *vcpu, struct vmcb_ctrl_area_cached *control) { + struct vcpu_svm *svm =3D to_svm(vcpu); + if (CC(!vmcb12_is_intercept(control, INTERCEPT_VMRUN))) return false; =20 @@ -364,6 +366,9 @@ static bool __nested_vmcb_check_controls(struct kvm_vcp= u *vcpu, return false; } =20 + if (!gmet_enabled || !guest_cpu_cap_has(vcpu, X86_FEATURE_GMET)) + svm->nested.ctl.nested_ctl &=3D ~SVM_NESTED_CTL_GMET_ENABLE; + return true; } =20 @@ -832,6 +837,7 @@ static void nested_vmcb02_prepare_control(struct vcpu_s= vm *svm, /* Use vmcb01 MMU and format if guest does not use nNPT */ if (nested_npt_enabled(svm)) { vmcb02->control.nested_ctl &=3D ~SVM_NESTED_CTL_GMET_ENABLE; + vmcb02->control.nested_ctl |=3D (svm->nested.ctl.nested_ctl & SVM_NESTED= _CTL_GMET_ENABLE); =20 nested_svm_init_mmu_context(vcpu); } diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 700090c3408c..430e4f4ef55b 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -5372,6 +5372,9 @@ static __init void svm_set_cpu_caps(void) if (boot_cpu_has(X86_FEATURE_PFTHRESHOLD)) kvm_cpu_cap_set(X86_FEATURE_PFTHRESHOLD); =20 + if (boot_cpu_has(X86_FEATURE_GMET)) + kvm_cpu_cap_set(X86_FEATURE_GMET); + if (vgif) kvm_cpu_cap_set(X86_FEATURE_VGIF); =20 --=20 2.53.0