Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Fixes: 7bfe3b8ea6e3 ("Drivers: hv: Introduce mshv_vtl driver")
Cc: stable@vger.kernel.org
Signed-off-by: Naman Jain <namjain@linux.microsoft.com>
Reviewed-by: Michael Kelley <mhklinux@outlook.com>
Signed-off-by: Wei Liu <wei.liu@kernel.org>

authored by

Naman Jain and committed by
Wei Liu
404cd6bf ca5ee0e9

+10 -4
+9 -3
drivers/hv/mshv_vtl_main.c
··· 386 386 387 387 if (copy_from_user(&vtl0_mem, arg, sizeof(vtl0_mem))) 388 388 return -EFAULT; 389 - /* vtl0_mem.last_pfn is excluded in the pagemap range for VTL0 as per design */ 390 389 if (vtl0_mem.last_pfn <= vtl0_mem.start_pfn) { 391 390 dev_err(vtl->module_dev, "range start pfn (%llx) > end pfn (%llx)\n", 392 391 vtl0_mem.start_pfn, vtl0_mem.last_pfn); ··· 396 397 if (!pgmap) 397 398 return -ENOMEM; 398 399 400 + /* 401 + * vtl0_mem.last_pfn is excluded in the pagemap range for VTL0 as per design. 402 + * last_pfn is not reserved or wasted, and reflects 'start_pfn + size' of pagemap range. 403 + */ 399 404 pgmap->ranges[0].start = PFN_PHYS(vtl0_mem.start_pfn); 400 405 pgmap->ranges[0].end = PFN_PHYS(vtl0_mem.last_pfn) - 1; 401 406 pgmap->nr_range = 1; ··· 408 405 /* 409 406 * Determine the highest page order that can be used for the given memory range. 410 407 * This works best when the range is aligned; i.e. both the start and the length. 408 + * Clamp to MAX_FOLIO_ORDER to avoid a WARN in memremap_pages() when the range 409 + * alignment exceeds the maximum supported folio order for this kernel config. 411 410 */ 412 - pgmap->vmemmap_shift = count_trailing_zeros(vtl0_mem.start_pfn | vtl0_mem.last_pfn); 411 + pgmap->vmemmap_shift = min(count_trailing_zeros(vtl0_mem.start_pfn | vtl0_mem.last_pfn), 412 + MAX_FOLIO_ORDER); 413 413 dev_dbg(vtl->module_dev, 414 414 "Add VTL0 memory: start: 0x%llx, end_pfn: 0x%llx, page order: %lu\n", 415 415 vtl0_mem.start_pfn, vtl0_mem.last_pfn, pgmap->vmemmap_shift); ··· 421 415 if (IS_ERR(addr)) { 422 416 dev_err(vtl->module_dev, "devm_memremap_pages error: %ld\n", PTR_ERR(addr)); 423 417 kfree(pgmap); 424 - return -EFAULT; 418 + return PTR_ERR(addr); 425 419 } 426 420 427 421 /* Don't free pgmap, since it has to stick around until the memory
+1 -1
include/uapi/linux/mshv.h
··· 357 357 358 358 struct mshv_vtl_ram_disposition { 359 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 363 363 struct mshv_vtl_set_poll_file {