From nobody Thu Oct 2 09:22:11 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 03BB81F3FEC for ; Fri, 19 Sep 2025 00:59:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758243601; cv=none; b=Wz8feKwZ97QZEGZ8r3YAX17ADv7+MA4Y59uaUPZEj+/Btcjw93YkZ3TQGYkX6xhVbbhhp0NzgaiHERfHo8aCU1My76qc/lCvmTVH+ic2DSsO3TKIwpZQxFabAYGDzYwWEcz04Vorx2JZfIO8iss8GpPboVBPws2lpfFnrLw+seA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758243601; c=relaxed/simple; bh=FfCh13Q+m92+CymbRlQmSA5l2N0xV/rmT0iRiDdm/D4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=e53TAmQEWLkVTZNfoGQoSg+3Lj9XkmIkgHcinAKuZrhAsiQ3YyaPHAa9c9hzTKYDGzRo3ezKa2iJz+GUAiPr+zA4WEYoiVlsPkCKMtc5GKC1DXX0mzq+tbKpZgfExfALRGw2rxjrnQlyFs72i1MgWj4rQrHtVruUFkmSGVyz1xw= 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=vhN5csWE; arc=none smtp.client-ip=209.85.214.202 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="vhN5csWE" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-24ae30bd2d0so12337955ad.3 for ; Thu, 18 Sep 2025 17:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758243599; x=1758848399; 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=OvlGI1x2xd9nnaxn6+YbYZ5V941T2eRm4PgITqh2qd4=; b=vhN5csWEC1zq5+4TiEGdenNHhy2vI3koxy08I2MTowtxFAArPMaqWPtAmH0J9emdeS A5je756RXM2gs64Zpgoslhu3iNOQQYChwj7+McQ6r+716CRsp5e7Xk+C9H6EE/O5+VWZ H7wH8rvFuCLJtu4aZzs0/mOmuk1EOSMafoYuavabUFKYi0qFZBmtLCXTfqNqwi7AxKhS SXfjKBMw0Wj1Ke26N0gUerm0ce4Mxh850wTJqDiucBE5RRNrkZRyOscOcjmv7mNEIgAH YyUNuTp3tz9+uxwrKRnU2zjeUmrMU7KEQV1cCbCirwqrx/Qb9/akj1GRb3doXG/hxS+j JkRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758243599; x=1758848399; 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=OvlGI1x2xd9nnaxn6+YbYZ5V941T2eRm4PgITqh2qd4=; b=DMp9rvZLo1D5C4gh8zIkItJusRtZZgOcyVvdZ+SEO8MTZb6/rLtFyW/qxFlRVAWaz/ vhq5NBLNdaEKvy8l1WBtWd6jxe9pBjuTxgLd9lQq9SADzkjT0QRTGWUgOSYUnHqsm4oc c9R/DvKpx+FQSM60yBHE0e0JNlfVwkjkrZXDHmaLSc3YLdkQrhrs+kdtbt598cMRBoi3 +Jv6496/JDjrGD2nqCCUIGvYQ01LubNlPraLWfRK1/YtHKCzOOHT+zOotA9OCav23yG3 P2J6mTkW5ml/pl80g6cnp74p1RZiSHcs0FwAp8tmvAcRE8hJ3fEfC7+zhe5E+pq28V6q AaMw== X-Forwarded-Encrypted: i=1; AJvYcCUMZb7p/W3dcMrZ6rWHfVnyprsaGv3lBiyPPNWXTtDznS5/DjhXSXvN2TZ799xUKe7U9CKQG038Vdwvg5E=@vger.kernel.org X-Gm-Message-State: AOJu0YxNgMo2v40xYZ44cvz8Or4haRNCg6O9EJ+qNfYphW/D7c1Meknk NSQIh71+vYe4X6qUeV+t91TAlj+XdPnO964pedsB5jjMb48MDIPX7Q9HvzYTlIluEcnGKqwswBH Y3GBASw== X-Google-Smtp-Source: AGHT+IF9CdEIDOE/UKd3QCqc4VwIlDG3jXKLfgBVhQjS9OcGyBwSpjhRCVv6E83o2ykIT0BdPjNtPktfrEY= X-Received: from pjvv5.prod.google.com ([2002:a17:90b:5885:b0:32b:58d1:a610]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ef44:b0:25c:343a:12eb with SMTP id d9443c01a7336-269ba402095mr18635305ad.4.1758243599336; Thu, 18 Sep 2025 17:59:59 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 18 Sep 2025 17:59:47 -0700 In-Reply-To: <20250919005955.1366256-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: <20250919005955.1366256-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.470.ga7dc726c21-goog Message-ID: <20250919005955.1366256-2-seanjc@google.com> Subject: [PATCH 1/9] KVM: VMX: Hoist construct_eptp() "up" in vmx.c From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move construct_eptp() further up in vmx.c so that it's above vmx_flush_tlb_current(), its "first" user in vmx.c. This will allow a future patch to opportunistically make construct_eptp() local to vmx.c. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/vmx.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 35037fc326e5..3c622c91cbc5 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -3201,6 +3201,20 @@ static inline int vmx_get_current_vpid(struct kvm_vc= pu *vcpu) return to_vmx(vcpu)->vpid; } =20 +u64 construct_eptp(struct kvm_vcpu *vcpu, hpa_t root_hpa, int root_level) +{ + u64 eptp =3D VMX_EPTP_MT_WB; + + eptp |=3D (root_level =3D=3D 5) ? VMX_EPTP_PWL_5 : VMX_EPTP_PWL_4; + + if (enable_ept_ad_bits && + (!is_guest_mode(vcpu) || nested_ept_ad_enabled(vcpu))) + eptp |=3D VMX_EPTP_AD_ENABLE_BIT; + eptp |=3D root_hpa; + + return eptp; +} + void vmx_flush_tlb_current(struct kvm_vcpu *vcpu) { struct kvm_mmu *mmu =3D vcpu->arch.mmu; @@ -3378,20 +3392,6 @@ static int vmx_get_max_ept_level(void) return 4; } =20 -u64 construct_eptp(struct kvm_vcpu *vcpu, hpa_t root_hpa, int root_level) -{ - u64 eptp =3D VMX_EPTP_MT_WB; - - eptp |=3D (root_level =3D=3D 5) ? VMX_EPTP_PWL_5 : VMX_EPTP_PWL_4; - - if (enable_ept_ad_bits && - (!is_guest_mode(vcpu) || nested_ept_ad_enabled(vcpu))) - eptp |=3D VMX_EPTP_AD_ENABLE_BIT; - eptp |=3D root_hpa; - - return eptp; -} - void vmx_load_mmu_pgd(struct kvm_vcpu *vcpu, hpa_t root_hpa, int root_leve= l) { struct kvm *kvm =3D vcpu->kvm; --=20 2.51.0.470.ga7dc726c21-goog