mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
nvdimm/region: Fix default alignment for small regions
[ Upstream commitd9d290d7e6
] In preparation for removing BLK aperture support the NVDIMM unit tests discovered that the default alignment can be set higher than the capacity of the region. Fall back to PAGE_SIZE in that case. Given this has not been seen in the wild, elide notifying -stable. Fixes:2522afb86a
("libnvdimm/region: Introduce an 'align' attribute") Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/164688416128.2879318.17890707310125575258.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
b9df3007b3
commit
865ff3e613
1 changed files with 3 additions and 0 deletions
|
@ -1025,6 +1025,9 @@ static unsigned long default_align(struct nd_region *nd_region)
|
|||
}
|
||||
}
|
||||
|
||||
if (nd_region->ndr_size < MEMREMAP_COMPAT_ALIGN_MAX)
|
||||
align = PAGE_SIZE;
|
||||
|
||||
mappings = max_t(u16, 1, nd_region->ndr_mappings);
|
||||
div_u64_rem(align, mappings, &remainder);
|
||||
if (remainder)
|
||||
|
|
Loading…
Reference in a new issue