History

mshv_vtl: Fix vmemmap_shift exceeding MAX_FOLIO_ORDER

When registering VTL0 memory via MSHV_ADD_VTL0_MEMORY, the kernel computes pgmap->vmemmap_shift as the number of trailing zeros in the OR of start_pfn and last_pfn, intending to use the largest compound page order both endpoints are aligned to. However, this value is not clamped to MAX_FOLIO_ORDER, so a sufficiently aligned range (e.g. physical range [0x800000000000, 0x800080000000), corresponding to start_pfn=0x800000000 with 35 trailing zeros) can produce a shift larger than what memremap_pages() accepts, triggering a WARN and returning -EINVAL: WARNING: ... memremap_pages+0x512/0x650 requested folio size unsupported The MAX_FOLIO_ORDER check was added by commit 646b67d57589 ("mm/memremap: reject unreasonable folio/compound page sizes in memremap_pages()"). Fix this by clamping vmemmap_shift to MAX_FOLIO_ORDER so we always request the largest order the kernel supports, in those cases, rather than an out-of-range value. Also fix the error path to propagate the actual error code from devm_memremap_pages() instead of hard-coding -EFAULT, which was masking the real -EINVAL return.

Naman Jain committed 7 months ago

Commit 404cd6b1 parent ca5ee0e2 files · +10 −4Browse files

Showing the changes to include/uapi/linux (1 of 2 files). Show all

Unified · Split

include/uapi/linux/mshv.h+1−1
@@ -357,7 +357,7 @@ struct mshv_vtl_sint_post_msg { · 356 unmodified lines
357 357
358struct mshv_vtl_ram_disposition {358struct mshv_vtl_ram_disposition {
359 __u64 start_pfn;359 __u64 start_pfn;
360 __u64 last_pfn;360 __u64 last_pfn; /* last_pfn is excluded from the range [start_pfn, last_pfn) */
361};361};
362 362
363struct mshv_vtl_set_poll_file {363struct mshv_vtl_set_poll_file {