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

cxl/hdm: Fix skip allocations vs multiple pmem allocations

Vishal notes that when attempting to define a second pmem region on a
device the DPA allocation fails with a message of the form:

decoder11.1: failed to reserve skipped space

Recall that the skip setting is used when there is a pmem allocation in
the presence of free ram DPA space. The first pmem allocation skips over
the free ram and subsequent pmem allocations do not require a skip. The
bug is that a skip is still attempted and the DPA reservation code
flags the double skip allocation conflict.

Fixes: cf880423b6a0 ("cxl/hdm: Add support for allocating DPA to an endpoint decoder")
Reported-by: Vishal Verma <vishal.l.verma@intel.com>
Tested-by: Vishal Verma <vishal.l.verma@intel.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Link: https://lore.kernel.org/r/165973754730.1558392.15466392461645857658.stgit@dwillia2-xfh.jf.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

+10 -1
+10 -1
drivers/cxl/core/hdm.c
··· 445 445 start = free_pmem_start; 446 446 avail = cxlds->pmem_res.end - start + 1; 447 447 skip_start = free_ram_start; 448 - skip_end = start - 1; 448 + 449 + /* 450 + * If some pmem is already allocated, then that allocation 451 + * already handled the skip. 452 + */ 453 + if (cxlds->pmem_res.child && 454 + skip_start == cxlds->pmem_res.child->start) 455 + skip_end = skip_start - 1; 456 + else 457 + skip_end = start - 1; 449 458 skip = skip_end - skip_start + 1; 450 459 } else { 451 460 dev_dbg(dev, "mode not set\n");