From mboxrd@z Thu Jan 1 00:00:00 1970 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 EC7072E7F1D for ; Tue, 30 Dec 2025 23:01:59 +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=1767135721; cv=none; b=GWJT+dENViHnvEJGvDWWJpRahm3rqRYuwn/de6G+OK1OAsu0WoNthsQeByw0NgaFG6ROqgzDmxBi4oSAVDORyKAAaLaQ4yMU1cbzyHuKQ+dZf0vKckA+cgoJeheSCZV+bBb/Rh2AspM900x7B7HiXF47HaDtFLhVq6kNUctWBMc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767135721; c=relaxed/simple; bh=gzGPTMBPkQtGA7aekWTJchDP0r6Rf1tv37EAxV+/uf0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oYGZpjrti2TeZIEbz4GQ7/AQp3sqbCVZb2mOIhZUXePgNjP/aMkbYgOLw3oiPCGlh6ltqE3LoERdHEWQiDH/afnLYJ1Yy++70F5INzozd117FG2LzzmC0PpxQuF3kkOmh9qZOzIzhJOKtQp5KStksbjAFHppOD1UiN1Lgu4FxNQ= 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=rB1PUpdv; 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="rB1PUpdv" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-34cc88eca7eso18704361a91.2 for ; Tue, 30 Dec 2025 15:01:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1767135719; x=1767740519; darn=lists.linux.dev; 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=kFEesFGPsutGHqF0001WthlsbSNNmBrKZgvGONrq/UE=; b=rB1PUpdvXDI70w8qNNUiryHX7Ziqe/RkjMTgV7PEOppSqw9BBb5mDBHxeyLdMaKyeT OBLh9r5NXzf+QZhhOtBVy9arqofpBsnZz0FVcOonmQsvHxRLrLIlk2NxfE6zdZv2Lh87 GEOHDyDAaEOoOH1A1/+SOAUAfmWEzD5v9mAzKoqrOp5eV4YnRtSoGLBtcEuYYOH6Vdiz XQ7tu5oizrDWN8/fFfYjMQu/wcgf+b6PN9Lx67KDbKUn9YxzjDjNDywHEVnMvo1CIwcX t/G6rCcLJW2bzZkCep2dwnTcIPO+zjoQEB2eyxoOYfNRwHURkRjvAqyaAlj73235jSyb Vg0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767135719; x=1767740519; 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=kFEesFGPsutGHqF0001WthlsbSNNmBrKZgvGONrq/UE=; b=E2h5eI6wDwKSCAQQmJQmxk6tEarTKSsYdDp3SDxJZa/EPtRXeyVSIJ7Cl93wDeW1xT yOYGhTUzx1f5XMKL+p7TEsAV1HBJBX6HSh1kic9hNI+QzqKtzfcnMg1BMRXVuVZEEFYI oQKYkNIbk27MtaqAOJ8OmCl/wPnFHzzcE5r7GsmyngdOcQjyAFOcYpYKGAD8CV/RI31A AyWplDz1yNNdslNVpOHlpEL7yBpIVuaX7SUd6KdD4aMDgEXiUIe9FZ6SrdCmzmFWbWx5 2DznRBQiiSymIkN3kDFZdz+foxuLFA4TKGKLx3hQD8w+XmkQfc3n5GxxrwEL5Faujpf2 XjQg== X-Forwarded-Encrypted: i=1; AJvYcCWpPcriPOuKKXZ464Xx/tNV2P+K1hyi+5QJ+OOAO2EcYWf1Q1D7Ms2GK0E9SXHN274nvy01xjM=@lists.linux.dev X-Gm-Message-State: AOJu0YzPvbHrOBBTH5ZLaCseSb7VEB7d6wRNrLG2swBtDUdZhGgNSFoA Stpnt2L/6gmdMfHlQCmpla+8V8myvGko5zKjzcsAxM606oVKIT/h1xC4VqI/aTT0QO5Hg1mTvkN jKLshjw== X-Google-Smtp-Source: AGHT+IFMvmVZegtbcaH8ygYeOdZA18LUtrqVKCjaPL92fD8viNNyqFkg9jykfPAXGidnl1kcsTEoQKpdcsc= X-Received: from pjbqe11.prod.google.com ([2002:a17:90b:4f8b:b0:34a:9e02:ffa0]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4a52:b0:340:99fd:9676 with SMTP id 98e67ed59e1d1-34e9212aaa9mr28973871a91.10.1767135719406; Tue, 30 Dec 2025 15:01:59 -0800 (PST) Reply-To: Sean Christopherson Date: Tue, 30 Dec 2025 15:01:33 -0800 In-Reply-To: <20251230230150.4150236-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev 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-5-seanjc@google.com> Subject: [PATCH v4 04/21] KVM: selftests: Kill eptPageTablePointer 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-Type: text/plain; charset="UTF-8" From: Yosry Ahmed Replace the struct overlay with explicit bitmasks, which is clearer and less error-prone. See commit f18b4aebe107 ("kvm: selftests: do not use bitfields larger than 32-bits for PTEs") for an example of why bitfields are not preferable. Remove the unused PAGE_SHIFT_4K definition while at it. No functional change intended. Signed-off-by: Yosry Ahmed Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/lib/x86/vmx.c | 35 +++++++++++------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/x86/vmx.c b/tools/testing/selftests/kvm/lib/x86/vmx.c index 1954ccdfc353..85043bb1ec4d 100644 --- a/tools/testing/selftests/kvm/lib/x86/vmx.c +++ b/tools/testing/selftests/kvm/lib/x86/vmx.c @@ -10,10 +10,16 @@ #include "processor.h" #include "vmx.h" -#define PAGE_SHIFT_4K 12 - #define KVM_EPT_PAGE_TABLE_MIN_PADDR 0x1c0000 +#define EPTP_MT_SHIFT 0 /* EPTP memtype bits 2:0 */ +#define EPTP_PWL_SHIFT 3 /* EPTP page walk length bits 5:3 */ +#define EPTP_AD_ENABLED_SHIFT 6 /* EPTP AD enabled bit 6 */ + +#define EPTP_WB (X86_MEMTYPE_WB << EPTP_MT_SHIFT) +#define EPTP_PWL_4 (3ULL << EPTP_PWL_SHIFT) /* PWL is (levels - 1) */ +#define EPTP_AD_ENABLED (1ULL << EPTP_AD_ENABLED_SHIFT) + bool enable_evmcs; struct hv_enlightened_vmcs *current_evmcs; @@ -34,14 +40,6 @@ struct eptPageTableEntry { uint64_t suppress_ve:1; }; -struct eptPageTablePointer { - uint64_t memory_type:3; - uint64_t page_walk_length:3; - uint64_t ad_enabled:1; - uint64_t reserved_11_07:5; - uint64_t address:40; - uint64_t reserved_63_52:12; -}; int vcpu_enable_evmcs(struct kvm_vcpu *vcpu) { uint16_t evmcs_ver; @@ -196,16 +194,15 @@ static inline void init_vmcs_control_fields(struct vmx_pages *vmx) vmwrite(PIN_BASED_VM_EXEC_CONTROL, rdmsr(MSR_IA32_VMX_TRUE_PINBASED_CTLS)); if (vmx->eptp_gpa) { - uint64_t ept_paddr; - struct eptPageTablePointer eptp = { - .memory_type = X86_MEMTYPE_WB, - .page_walk_length = 3, /* + 1 */ - .ad_enabled = ept_vpid_cap_supported(VMX_EPT_VPID_CAP_AD_BITS), - .address = vmx->eptp_gpa >> PAGE_SHIFT_4K, - }; + uint64_t eptp = vmx->eptp_gpa | EPTP_WB | EPTP_PWL_4; - memcpy(&ept_paddr, &eptp, sizeof(ept_paddr)); - vmwrite(EPT_POINTER, ept_paddr); + TEST_ASSERT((vmx->eptp_gpa & ~PHYSICAL_PAGE_MASK) == 0, + "Illegal bits set in vmx->eptp_gpa"); + + if (ept_vpid_cap_supported(VMX_EPT_VPID_CAP_AD_BITS)) + eptp |= EPTP_AD_ENABLED; + + vmwrite(EPT_POINTER, eptp); sec_exec_ctl |= SECONDARY_EXEC_ENABLE_EPT; } -- 2.52.0.351.gbe84eed79e-goog