From nobody Sun Feb 8 22:49:01 2026 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 9CE38322B6A for ; Tue, 30 Dec 2025 23:02:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767135747; cv=none; b=VDteETcKYlmtXVuPCC/jFO2dcwekPCNVZR4PgTxbYEUqO28X1pORXU2VIlG5LPTG1EjftEEZ2IST9PkQUKBZWezDzAJIqP06BBmrr+WuwrwPADJnLCgI02aGbKs3w2Gmwu/Yt6Zl8+JUzVSrEHU8ieDMTEgsRvmODbYwDgiL/A4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767135747; c=relaxed/simple; bh=YGA8CA4s7Z2CWClwBVpAk8yl9E1CB5xxazIcYOSG0No=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YTVlsXup3sEmh73ti6ch2khlNIoroLMLqWOF9vvJsxIlEiYwguGkxf7R1bHOXmdfxfT3yGSduWXaKQgXoeOczi55kSBWsasUqeDaA4y5bO7RJlRrSnUQiuoMdmzfWJvVSqa530kpvG4zqKweBHBRG3LZVcDH08j2ZZ60TwDDR0Q= 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=r97hhyBv; arc=none smtp.client-ip=209.85.214.201 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="r97hhyBv" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2a090819ed1so84562765ad.2 for ; Tue, 30 Dec 2025 15:02:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1767135742; x=1767740542; 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=FMYWTnD6Tv1L5yY9MguuNjhNHloVV4vNjkLbvD2vfOU=; b=r97hhyBvJa5Xp4IjZ+4CK7ISV0b1iVpq7LJv44TM0nAmALdfGX77uhDwWS1g6kYrJk o9g/gjs5NAIp7bDbJmEvmc+kF2BXn0tXQmTPSFxY9BEc0bUq6uG2kkI2z+XG7Y8JA7TE RvxIpYTS8IKsDmxUAroDvW/F1szaH87uZPswQw8yG054ahwXzjne0QH3A6A7dxi39O5o YcT6GU4l0XWYKvyqRQuBDKWGy9Qwxq64K05rtfCSu/FVAc1itfXuxudSReWqttu7k/dM 5BaoWT5bmzBHRwVfNxb1R58GY2tkPgJ6O1mJrYyen3Wk479NEpW0hPYWqv32auHvBsVx +87w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767135742; x=1767740542; 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=FMYWTnD6Tv1L5yY9MguuNjhNHloVV4vNjkLbvD2vfOU=; b=PZdp8eilpa/o4WafSq5fgSnvzcIUlXXwJ2Jzze2XuydSE4rRoOPg/+rfc8xs2BRI7X dBGSbwvuNDZapWXI7+GooaxQHhVX4apkmG+/kUVpYUSZQosQa7qG/+3bgi2WKuaF5sXm hkbXahrxiTkqd6ckZmXFXQGENvDYnIVLCBMUH65fO0SSmxPhIdEYH1K4tyUDbcvgKPqs 0KpcmknHaNaabPn/Rt3HKb2tzZDvM8IGxEgVErd49vo3fxWqArNUN9lFHCVPwLKb58Zl J8p+X3IKn9GAYkIHUbpJjU+uVnYPT3VTV+I96Qc1Xbx4nYkXThVPzNkACNGxwzWo+1W0 XLaA== X-Forwarded-Encrypted: i=1; AJvYcCWsOqSsv/5nv0ZQgSZLyzrp3UCGoExxxss9LHflzTM0UYXiHUhfiwEBq26hC4j8neS8JuvztyWaB/f6pmw=@vger.kernel.org X-Gm-Message-State: AOJu0YzFyN8wvuZg8dKV3smJ4/9KdUn6l5+pcPK4DX853/BcHzyRElCs uj6cEPQseh684sRtWkU92bRRnUSFcFr80UDtzy5mg06zwnMoRhdjxhTW2NtY2JaO8pIO0AAsNl9 kTK4RmQ== X-Google-Smtp-Source: AGHT+IEPzwhGxGkpTdzvCyQe6ViV9J79G7ardG1q/yA1uYuatCDGiLbmMWR1E1eqCq7xQW2f9AolN3qf2J8= X-Received: from plzv12.prod.google.com ([2002:a17:902:b7cc:b0:298:1f9e:c334]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e5c7:b0:2a0:be5d:d53d with SMTP id d9443c01a7336-2a2f2a361c2mr352279255ad.53.1767135742297; Tue, 30 Dec 2025 15:02:22 -0800 (PST) Reply-To: Sean Christopherson Date: Tue, 30 Dec 2025 15:01:46 -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-18-seanjc@google.com> Subject: [PATCH v4 17/21] KVM: selftests: Set the user bit on nested NPT PTEs 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 According to the APM, NPT walks are treated as user accesses. In preparation for supporting NPT mappings, set the 'user' bit on NPTs by adding a mask of bits to always be set on PTEs in kvm_mmu. Signed-off-by: Yosry Ahmed Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/include/x86/kvm_util_arch.h | 2 ++ tools/testing/selftests/kvm/include/x86/processor.h | 1 + tools/testing/selftests/kvm/lib/x86/processor.c | 5 +++-- tools/testing/selftests/kvm/lib/x86/svm.c | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86/kvm_util_arch.h b/tool= s/testing/selftests/kvm/include/x86/kvm_util_arch.h index 1cf84b8212c6..be35d26bb320 100644 --- a/tools/testing/selftests/kvm/include/x86/kvm_util_arch.h +++ b/tools/testing/selftests/kvm/include/x86/kvm_util_arch.h @@ -22,6 +22,8 @@ struct pte_masks { uint64_t nx; uint64_t c; uint64_t s; + + uint64_t always_set; }; =20 struct kvm_mmu_arch { diff --git a/tools/testing/selftests/kvm/include/x86/processor.h b/tools/te= sting/selftests/kvm/include/x86/processor.h index deb471fb9b51..7b7d962244d6 100644 --- a/tools/testing/selftests/kvm/include/x86/processor.h +++ b/tools/testing/selftests/kvm/include/x86/processor.h @@ -1450,6 +1450,7 @@ enum pg_level { #define PTE_NX_MASK(mmu) ((mmu)->arch.pte_masks.nx) #define PTE_C_BIT_MASK(mmu) ((mmu)->arch.pte_masks.c) #define PTE_S_BIT_MASK(mmu) ((mmu)->arch.pte_masks.s) +#define PTE_ALWAYS_SET_MASK(mmu) ((mmu)->arch.pte_masks.always_set) =20 /* * For PTEs without a PRESENT bit (i.e. EPT entries), treat the PTE as pre= sent diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testin= g/selftests/kvm/lib/x86/processor.c index a3a4c9a4cbcb..5a3385d48902 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -231,7 +231,8 @@ static uint64_t *virt_create_upper_pte(struct kvm_vm *v= m, =20 if (!is_present_pte(mmu, pte)) { *pte =3D PTE_PRESENT_MASK(mmu) | PTE_READABLE_MASK(mmu) | - PTE_WRITABLE_MASK(mmu) | PTE_EXECUTABLE_MASK(mmu); + PTE_WRITABLE_MASK(mmu) | PTE_EXECUTABLE_MASK(mmu) | + PTE_ALWAYS_SET_MASK(mmu); if (current_level =3D=3D target_level) *pte |=3D PTE_HUGE_MASK(mmu) | (paddr & PHYSICAL_PAGE_MASK); else @@ -299,7 +300,7 @@ void __virt_pg_map(struct kvm_vm *vm, struct kvm_mmu *m= mu, uint64_t vaddr, "PTE already present for 4k page at vaddr: 0x%lx", vaddr); *pte =3D PTE_PRESENT_MASK(mmu) | PTE_READABLE_MASK(mmu) | PTE_WRITABLE_MASK(mmu) | PTE_EXECUTABLE_MASK(mmu) | - (paddr & PHYSICAL_PAGE_MASK); + PTE_ALWAYS_SET_MASK(mmu) | (paddr & PHYSICAL_PAGE_MASK); =20 /* * Neither SEV nor TDX supports shared page tables, so only the final diff --git a/tools/testing/selftests/kvm/lib/x86/svm.c b/tools/testing/self= tests/kvm/lib/x86/svm.c index 8e4795225595..18e9e9089643 100644 --- a/tools/testing/selftests/kvm/lib/x86/svm.c +++ b/tools/testing/selftests/kvm/lib/x86/svm.c @@ -72,6 +72,9 @@ void vm_enable_npt(struct kvm_vm *vm) pte_masks =3D vm->mmu.arch.pte_masks; pte_masks.c =3D 0; =20 + /* NPT walks are treated as user accesses, so set the 'user' bit. */ + pte_masks.always_set =3D pte_masks.user; + tdp_mmu_init(vm, vm->mmu.pgtable_levels, &pte_masks); } =20 --=20 2.52.0.351.gbe84eed79e-goog