Skip to content

Commit 404cd6b

Browse files
Naman Jainliuw
authored andcommitted
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 646b67d ("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: 7bfe3b8 ("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>
1 parent ca5ee0e commit 404cd6b

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

drivers/hv/mshv_vtl_main.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@ static int mshv_vtl_ioctl_add_vtl0_mem(struct mshv_vtl *vtl, void __user *arg)
386386

387387
if (copy_from_user(&vtl0_mem, arg, sizeof(vtl0_mem)))
388388
return -EFAULT;
389-
/* vtl0_mem.last_pfn is excluded in the pagemap range for VTL0 as per design */
390389
if (vtl0_mem.last_pfn <= vtl0_mem.start_pfn) {
391390
dev_err(vtl->module_dev, "range start pfn (%llx) > end pfn (%llx)\n",
392391
vtl0_mem.start_pfn, vtl0_mem.last_pfn);
@@ -397,6 +396,10 @@ static int mshv_vtl_ioctl_add_vtl0_mem(struct mshv_vtl *vtl, void __user *arg)
397396
if (!pgmap)
398397
return -ENOMEM;
399398

399+
/*
400+
* vtl0_mem.last_pfn is excluded in the pagemap range for VTL0 as per design.
401+
* last_pfn is not reserved or wasted, and reflects 'start_pfn + size' of pagemap range.
402+
*/
400403
pgmap->ranges[0].start = PFN_PHYS(vtl0_mem.start_pfn);
401404
pgmap->ranges[0].end = PFN_PHYS(vtl0_mem.last_pfn) - 1;
402405
pgmap->nr_range = 1;
@@ -405,8 +408,11 @@ static int mshv_vtl_ioctl_add_vtl0_mem(struct mshv_vtl *vtl, void __user *arg)
405408
/*
406409
* Determine the highest page order that can be used for the given memory range.
407410
* This works best when the range is aligned; i.e. both the start and the length.
411+
* Clamp to MAX_FOLIO_ORDER to avoid a WARN in memremap_pages() when the range
412+
* alignment exceeds the maximum supported folio order for this kernel config.
408413
*/
409-
pgmap->vmemmap_shift = count_trailing_zeros(vtl0_mem.start_pfn | vtl0_mem.last_pfn);
414+
pgmap->vmemmap_shift = min(count_trailing_zeros(vtl0_mem.start_pfn | vtl0_mem.last_pfn),
415+
MAX_FOLIO_ORDER);
410416
dev_dbg(vtl->module_dev,
411417
"Add VTL0 memory: start: 0x%llx, end_pfn: 0x%llx, page order: %lu\n",
412418
vtl0_mem.start_pfn, vtl0_mem.last_pfn, pgmap->vmemmap_shift);
@@ -415,7 +421,7 @@ static int mshv_vtl_ioctl_add_vtl0_mem(struct mshv_vtl *vtl, void __user *arg)
415421
if (IS_ERR(addr)) {
416422
dev_err(vtl->module_dev, "devm_memremap_pages error: %ld\n", PTR_ERR(addr));
417423
kfree(pgmap);
418-
return -EFAULT;
424+
return PTR_ERR(addr);
419425
}
420426

421427
/* Don't free pgmap, since it has to stick around until the memory

include/uapi/linux/mshv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ struct mshv_vtl_sint_post_msg {
357357

358358
struct mshv_vtl_ram_disposition {
359359
__u64 start_pfn;
360-
__u64 last_pfn;
360+
__u64 last_pfn; /* last_pfn is excluded from the range [start_pfn, last_pfn) */
361361
};
362362

363363
struct mshv_vtl_set_poll_file {

0 commit comments

Comments
 (0)