On Fri, Mar 01, 2024, isaku.yamahata@xxxxxxxxx wrote:
> +int kvm_arch_vcpu_map_memory(struct kvm_vcpu *vcpu,
> + struct kvm_memory_mapping *mapping)
> +{
> + u8 max_level, goal_level = PG_LEVEL_4K;
goal_level is misleading. kvm_page_fault.goal_level is appropriate, because for
the majority of the structures lifetime, it is the level KVM is trying to map,
not the level that KVM has mapped.
For this variable, maybe "mapped_level" or just "level"
> + u32 error_code;
u64 when this gets rebased...
> + int r;
> +
> + error_code = 0;
> + if (mapping->flags & KVM_MEMORY_MAPPING_FLAG_WRITE)
> + error_code |= PFERR_WRITE_MASK;
> + if (mapping->flags & KVM_MEMORY_MAPPING_FLAG_EXEC)
> + error_code |= PFERR_FETCH_MASK;
> + if (mapping->flags & KVM_MEMORY_MAPPING_FLAG_USER)
> + error_code |= PFERR_USER_MASK;
> + if (mapping->flags & KVM_MEMORY_MAPPING_FLAG_PRIVATE) {
> +#ifdef PFERR_PRIVATE_ACCESS
> + error_code |= PFERR_PRIVATE_ACCESS;
...because PFERR_PRIVATE_ACCESS is in bits 63:32.
> +#else
> + return -OPNOTSUPP;
Broken code. And I don't see any reason for this to exist, PFERR_PRIVATE_ACCESS
will be unconditionally #defined.
> +#endif
> + }
> +
> + if (IS_ALIGNED(mapping->base_gfn, KVM_PAGES_PER_HPAGE(PG_LEVEL_1G)) &&
> + mapping->nr_pages >= KVM_PAGES_PER_HPAGE(PG_LEVEL_1G))
> + max_level = PG_LEVEL_1G;
> + else if (IS_ALIGNED(mapping->base_gfn, KVM_PAGES_PER_HPAGE(PG_LEVEL_2M)) &&
> + mapping->nr_pages >= KVM_PAGES_PER_HPAGE(PG_LEVEL_2M))
> + max_level = PG_LEVEL_2M;
> + else
> + max_level = PG_LEVEL_4K;
Hrm, I would much prefer to allow KVM to map more than what is requested, i.e.
not artificially restrict the hugepage size. Restricting the mapping size is
just giving userspace another way to shoot themselves in the foot. E.g. if
userspace prefaults the wrong size, KVM will likely either run with degraded
performance or immediately zap and rebuild the too-small SPTE.
Ugh, and TDX's S-EPT *must* be populated with 4KiB entries to start. On one hand,
allowing KVM to map a larger page (but still bounded by the memslot(s)) won't affect
TDX's measurement, because KVM never use a larger page. On the other hand, TDX
would need a way to restrict the mapping.
Another complication is that TDH.MEM.PAGE.ADD affects the measurement. We can
push the ordering requirements to userspace, but for all intents and purposes,
calls to this ioctl() would need to be serialized for doing PAGE.ADD, but could
run in parallel for every other use case, including PAGE.AUG and pre-mapping
shared memory for TDX.
Hrm.
Wait. KVM doesn't *need* to do PAGE.ADD from deep in the MMU. The only inputs to
PAGE.ADD are the gfn, pfn, tdr (vm), and source. The S-EPT structures need to be
pre-built, but when they are built is irrelevant, so long as they are in place
before PAGE.ADD.
Crazy idea. For TDX S-EPT, what if KVM_MAP_MEMORY does all of the SEPT.ADD stuff,
which doesn't affect the measurement, and even fills in KVM's copy of the leaf EPTE,
but tdx_sept_set_private_spte() doesn't do anything if the TD isn't finalized?
Then KVM provides a dedicated TDX ioctl(), i.e. what is/was KVM_TDX_INIT_MEM_REGION,
to do PAGE.ADD. KVM_TDX_INIT_MEM_REGION wouldn't need to map anything, it would
simply need to verify that the pfn from guest_memfd() is the same as what's in
the TDP MMU.
Or if we want to make things more robust for userspace, set a software-available
flag in the leaf TDP MMU SPTE to indicate that the page is awaiting PAGE.ADD.
That way tdp_mmu_map_handle_target_level() wouldn't treat a fault as spurious
(KVM will see the SPTE as PRESENT, but the S-EPT entry will be !PRESENT).
Then KVM_MAP_MEMORY doesn't need to support @source, KVM_TDX_INIT_MEM_REGION
doesn't need to fake a page fault and doesn't need to temporarily stash the
source_pa in KVM, and KVM_MAP_MEMORY could be used to fully pre-map TDX memory.
I believe the only missing piece is a way for the TDX code to communicate that
hugepages are disallowed.
