From nobody Sun Feb 8 22:49:01 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 3AAF9303A32 for ; Tue, 30 Dec 2025 23:02:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767135742; cv=none; b=fYqq/RrjM/7fl5HvXEEqgqLu2v2j1kLu0YE+uL8dcUvMiaO2kxEUbNmsxj17Vg/BJZW5Dz/AZER1679/1ViLgxNKFZj0+l9x7OcqgwIDOsyQjms+RPGMTpjQsDNs8j5wUb2CRSM68MwqP6EqXFR6HMEUvKU6mibfRQvF/a5dzno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767135742; c=relaxed/simple; bh=urAFT6EJOW1W5qRLVZla3ZmDxnhGkG5YJibpWY0+6OQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tjlRyHNmaYU/AFLxJgyp+RoH0qZmhsEf8wadLpSgm6pBdoarzDn1Nj8TMxw0B9QVfVkHkqzXamSoQlJC+gV59sd1hrQzUuaU+Owj8srvlkiJZjQurUjm9CDyR0Q8xtCB2sv1qHVa57h0N99rIdko8RkvApLL29jjQ5Y1IfIErXU= 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=dt4nNH9g; arc=none smtp.client-ip=209.85.216.73 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="dt4nNH9g" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-34ea5074935so9471060a91.0 for ; Tue, 30 Dec 2025 15:02:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1767135739; x=1767740539; 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=huRdRK/iPbU8RR9eXbhBU7huR1SivgrOj8/wOFgY0o8=; b=dt4nNH9g0idbSJAGh3JcAgXjqAuhC0/fSR/0PFd5PI5YoErvrN48GL136WPjYfGtWI kv3yIGhIrJlYaEY+gyMwwUeDrO2yrOdyrJSYDXLhhNmPHObYqCBPkdveosnKtUdEppYM DA03fmEatVqi9PRRLSE/7k21zL0nXwKAzXKcJl5t9ky1W8Yb8eodKa5p4buCAsx4GPCM FSeJuGEkcoBMdK4nQU8HykGAws/9+VbUmy6VqhBm9xG9l4JueqWHu97mibpZyI6nCVPl 92Kyzp6MJPAmWAjI0GLVXejDOhaHoMZoze6e4mT4wgrQUXgoHyoy6FmKfnpML9Qh+Wpz M/jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767135739; x=1767740539; 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=huRdRK/iPbU8RR9eXbhBU7huR1SivgrOj8/wOFgY0o8=; b=oM8Bmw/NJavgc/Y/6Ey0+kLoXS2HYg6JS9vnycBcbEOcp1Qhx2LFWpJREStQLkXloD OAlyNNMGn+6Kbkvr9k0kD2IWYht0gY6NMXXtCJLkIww/0cWqGEiX728fyVjk082K+S9H z5A46sJRkVDHdmu0fMYVR763CmAqB3SO3+//lB+fOCyvsyK5VZIg9RKIRWFrgCJQNEwB WzFpnEofkZuAG814U4kBGbPNgtW3ChfPyyQXszCIQ5tvGOHPbx0pIHAHj4IyJ19j5cyH ism+sa6A8S2WW9njJlnmB9+v4o1WNHlGAI0hXaASPG08kPJuwf1ruxt9qmxFoIzHFmht XaNg== X-Forwarded-Encrypted: i=1; AJvYcCX8kzJi3TwJBkDULDpySCuOkMrWMLsDm8Zt8xYaYlibCQM0Xs0yDE9JRFDMN/LAGrfQtYfBRqaSXszCaUI=@vger.kernel.org X-Gm-Message-State: AOJu0YyXAoQUBt4aQqme9lRY2rwNPP/uIzNS6qxjWOy33ZjQDcRmmTkP zUWjCAYVXtU6loZ0crqW78WBjwQYWdg4wix5kaIT2BGR+nnWyI9qfYCoOh7je9BBOoHxbL/ZfF2 d099x5g== X-Google-Smtp-Source: AGHT+IGZKtBCYgVUD+NyJMek1FLHVR3iv8QadOzR34XMxVrGwi8alAagMVcgqb3s54atcYK8jGvrWX49Hsw= X-Received: from pjwt5.prod.google.com ([2002:a17:90a:d145:b0:34c:7437:183d]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:580e:b0:34e:5516:6655 with SMTP id 98e67ed59e1d1-34e92143ca1mr27682847a91.9.1767135738632; Tue, 30 Dec 2025 15:02:18 -0800 (PST) Reply-To: Sean Christopherson Date: Tue, 30 Dec 2025 15:01:44 -0800 In-Reply-To: <20251230230150.4150236-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: <20251230230150.4150236-1-seanjc@google.com> X-Mailer: git-send-email 2.52.0.351.gbe84eed79e-goog Message-ID: <20251230230150.4150236-16-seanjc@google.com> Subject: [PATCH v4 15/21] KVM: selftests: Allow kvm_cpu_has_ept() to be called on AMD CPUs From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Yosry Ahmed Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Yosry Ahmed In preparation for generalizing the nested dirty logging test, checking if either EPT or NPT is enabled will be needed. To avoid needing to gate the kvm_cpu_has_ept() call by the CPU type, make sure the function returns false if VMX is not available instead of trying to read VMX-only MSRs. No functional change intended. Signed-off-by: Yosry Ahmed Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/lib/x86/vmx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/testing/selftests/kvm/lib/x86/vmx.c b/tools/testing/self= tests/kvm/lib/x86/vmx.c index 448a63457467..c87b340362a9 100644 --- a/tools/testing/selftests/kvm/lib/x86/vmx.c +++ b/tools/testing/selftests/kvm/lib/x86/vmx.c @@ -377,6 +377,9 @@ bool kvm_cpu_has_ept(void) { uint64_t ctrl; =20 + if (!kvm_cpu_has(X86_FEATURE_VMX)) + return false; + ctrl =3D kvm_get_feature_msr(MSR_IA32_VMX_TRUE_PROCBASED_CTLS) >> 32; if (!(ctrl & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS)) return false; --=20 2.52.0.351.gbe84eed79e-goog