From nobody Wed Oct 8 18:23:29 2025 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 3317D335C7 for ; Thu, 26 Jun 2025 00:12:30 +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=1750896752; cv=none; b=WX9564IZK2WUPyEK5WHF678vuvQo6IDZJJC0Z3Nk3WgIQxSmnBysD92PZuGzxLIunRFfiu1F06q7uAY9fW+hAgiMGdu4n6/0/bFsKR0m+ipibuopm9n/rlQLpfrhzQWSugOB/dF25dneAZ4E4Gy8E7GkyoyKVg4DUesK8XjNG9c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750896752; c=relaxed/simple; bh=2XyDfFWH/0eDwvNxvoMEhqm8qOkWL90TlQT4lYrrQX4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=thQT9Azzw9chafA1RAUO0HNpf6oZl1znKH7OiMXnJWgdFfCURn1oQbhbWlTiy15lQqgmDlIAlKtAfbk13QmkjxXy/B002zncl4Bp/ODQLDh8ShD44W1IZu2Gef9PznLYSFN28yWJSRmomEREltVDaJdq5MYxtmbMZnh7hFu5QL4= 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=RZAC4igl; 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="RZAC4igl" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3138e671316so335679a91.0 for ; Wed, 25 Jun 2025 17:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1750896750; x=1751501550; 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=XIDgjwUm8CjgtXg9AIcmlFZZ7eZmoPHxzXcxCBew1V0=; b=RZAC4iglHDc5wFi5q3yqGFjPakn8kr1A7dPSAmqa1fhRxDppBSuhFxdmXgCipNd2SD s5+bMK70UA0lJZxbmumw0gRV/Qpuj6DLs8plH4pE8X7VjGEfrji88BuGbyyOl0E8e0WH ZSFE888OtxweQHNUd+l18qw6qPJW95DJNjnM7F0TAJrJ2O2nZGURWBKeZYGImrRWlJgz qyryiiE5sVAxg3ojccoa29ePlbd+lvAVkVd5mkUlrwPeFtvRJxJALJmfIUmw9iFwjQrv Bfqim8qncHG8l9BOjMKKLQpgrDaCK6cDXsU5mb0ukcseGpM9mDa5MTkbWRHCiCjfoKuf GXsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750896750; x=1751501550; 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=XIDgjwUm8CjgtXg9AIcmlFZZ7eZmoPHxzXcxCBew1V0=; b=tdbZ9yNFL4zqqhdw/q+0TnvjMaZIAA74JJz27kbxWy44Em69d9Rm15UG3O1E8vDlF7 rz6n6fOUgH5psTmsuZWgXSg7hGKyDLtv8QnjYyL4tkr/Ck0Up6SBcEkrTCqvbbJ7mgI+ t9n59YxLfCCU0UaLycMXAqe4Dv45gV9eHIJOiFQv6vI5p+r1RHTiEgVfMLRV0Frd/Fxq YAwOvAdN8lbjJ46SaXYWRKCW2KzQqTOlGhSQVb1137KI8B2yGWfpDI20y1DvV0m21vXH euZo2LR6dFxVWfF3y2HVwvZJCBrHxBtz1PRgY1/f9pBF26oHZRummoYW+W1LsEPxThrM Q/kQ== X-Forwarded-Encrypted: i=1; AJvYcCU1zS/icVUA55j+yFO4fPYBqX4Ly9VBjScqtkDhSZWzQcZ8oGrdhUDZsdknmYq7wbxSbS6HEFGBXTEkG4o=@vger.kernel.org X-Gm-Message-State: AOJu0YwR5xvIMkZJbACLEgnDjjJfZn+Ee4Bt9yJ/h4co2GcN/9mkYQs1 1VzA76/KGiRX4pDAAh+c0Rfel3avY5on/al+eBN30nctkcjWmq+8SLF2TBLzLjloWGjpIKFK6NE 9nnx5hw== X-Google-Smtp-Source: AGHT+IFxqzI3I7qPfHhdkJFEVHE7dAj1xtEraHFWyog88QsjEjNsPNLon63KPUv4mv/v10Bg3S343op+M7c= X-Received: from pjvf13.prod.google.com ([2002:a17:90a:da8d:b0:2fe:800f:23a]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5345:b0:311:1617:5bc4 with SMTP id 98e67ed59e1d1-316ed3a99d5mr1851989a91.12.1750896750459; Wed, 25 Jun 2025 17:12:30 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 25 Jun 2025 17:12:21 -0700 In-Reply-To: <20250626001225.744268-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: <20250626001225.744268-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250626001225.744268-2-seanjc@google.com> Subject: [PATCH v5 1/5] KVM: x86: Replace growing set of *_in_guest bools with a u64 From: Sean Christopherson To: Paolo Bonzini , Sean Christopherson , Marc Zyngier , Oliver Upton Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Jim Mattson Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jim Mattson Store each "disabled exit" boolean in a single bit rather than a byte. No functional change intended. Suggested-by: Sean Christopherson Signed-off-by: Jim Mattson Link: https://lore.kernel.org/r/20250530185239.2335185-2-jmattson@google.com Signed-off-by: Sean Christopherson Reviewed-by: Xiaoyao Li --- arch/x86/include/asm/kvm_host.h | 5 +---- arch/x86/kvm/svm/svm.c | 2 +- arch/x86/kvm/vmx/vmx.c | 2 +- arch/x86/kvm/x86.c | 9 +-------- arch/x86/kvm/x86.h | 13 +++++++++---- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_hos= t.h index bf26dfb5416d..6fdeeb5870b3 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1407,10 +1407,7 @@ struct kvm_arch { =20 gpa_t wall_clock; =20 - bool mwait_in_guest; - bool hlt_in_guest; - bool pause_in_guest; - bool cstate_in_guest; + u64 disabled_exits; =20 s64 kvmclock_offset; =20 diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index ab11d1d0ec51..5ad54640314f 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -5015,7 +5015,7 @@ static int svm_vm_init(struct kvm *kvm) } =20 if (!pause_filter_count || !pause_filter_thresh) - kvm->arch.pause_in_guest =3D true; + kvm_disable_exits(kvm, KVM_X86_DISABLE_EXITS_PAUSE); =20 if (enable_apicv) { int ret =3D avic_vm_init(kvm); diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 65949882afa9..702486e7511c 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -7519,7 +7519,7 @@ int vmx_vcpu_create(struct kvm_vcpu *vcpu) int vmx_vm_init(struct kvm *kvm) { if (!ple_gap) - kvm->arch.pause_in_guest =3D true; + kvm_disable_exits(kvm, KVM_X86_DISABLE_EXITS_PAUSE); =20 if (boot_cpu_has(X86_BUG_L1TF) && enable_ept) { switch (l1tf_mitigation) { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 2806f7104295..2d893993262b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6481,14 +6481,7 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, (cap->args[0] & ~KVM_X86_DISABLE_EXITS_PAUSE)) pr_warn_once(SMT_RSB_MSG); =20 - if (cap->args[0] & KVM_X86_DISABLE_EXITS_PAUSE) - kvm->arch.pause_in_guest =3D true; - if (cap->args[0] & KVM_X86_DISABLE_EXITS_MWAIT) - kvm->arch.mwait_in_guest =3D true; - if (cap->args[0] & KVM_X86_DISABLE_EXITS_HLT) - kvm->arch.hlt_in_guest =3D true; - if (cap->args[0] & KVM_X86_DISABLE_EXITS_CSTATE) - kvm->arch.cstate_in_guest =3D true; + kvm_disable_exits(kvm, cap->args[0]); r =3D 0; disable_exits_unlock: mutex_unlock(&kvm->lock); diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index db4e6a90e83d..31ae58b765f3 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -521,24 +521,29 @@ static inline u64 nsec_to_cycles(struct kvm_vcpu *vcp= u, u64 nsec) __rem; \ }) =20 +static inline void kvm_disable_exits(struct kvm *kvm, u64 mask) +{ + kvm->arch.disabled_exits |=3D mask; +} + static inline bool kvm_mwait_in_guest(struct kvm *kvm) { - return kvm->arch.mwait_in_guest; + return kvm->arch.disabled_exits & KVM_X86_DISABLE_EXITS_MWAIT; } =20 static inline bool kvm_hlt_in_guest(struct kvm *kvm) { - return kvm->arch.hlt_in_guest; + return kvm->arch.disabled_exits & KVM_X86_DISABLE_EXITS_HLT; } =20 static inline bool kvm_pause_in_guest(struct kvm *kvm) { - return kvm->arch.pause_in_guest; + return kvm->arch.disabled_exits & KVM_X86_DISABLE_EXITS_PAUSE; } =20 static inline bool kvm_cstate_in_guest(struct kvm *kvm) { - return kvm->arch.cstate_in_guest; + return kvm->arch.disabled_exits & KVM_X86_DISABLE_EXITS_CSTATE; } =20 static inline bool kvm_notify_vmexit_enabled(struct kvm *kvm) --=20 2.50.0.727.gbf7dc18ff4-goog