Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 05:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/scatterlist: Fix to calculate the last_pg properly

Browse Source 
The last_pg is wrong, it is actually the first page of the last
scatterlist element. To get the last page of the last scatterlist element
we have to add prv->length. So it is checking mergability against the
wrong page, Further, a SG element is not guaranteed to end on a page
boundary, so we have to check the sub page location also for merge
eligibility.

Fix the above by checking physical contiguity based on PFNs, compute the
actual last page and then call pages_are_mergable().

Fixes: 1567b49d1a ("lib/scatterlist: add check when merging zone device pages")
Link: https://lore.kernel.org/r/20230111101054.188136-1-yishaih@nvidia.com
Reported-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Yishai Hadas <yishaih@nvidia.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
This commit is contained in:
Yishai Hadas 2023-01-11 12:10:54 +02:00 committed by Jason Gunthorpe
parent b3deec2584
commit 0f097f08c9
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/scatterlist.c
View File

@ -470,22 +470,27 @@ int sg_alloc_append_table_from_pages(struct sg_append_table *sgt_append,
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (sgt_append->prv) { if (sgt_append->prv) {
unsigned long next_pfn = (page_to_phys(sg_page(sgt_append->prv)) +
sgt_append->prv->offset + sgt_append->prv->length) / PAGE_SIZE;
if (WARN_ON(offset)) if (WARN_ON(offset))
return -EINVAL; return -EINVAL;
/* Merge contiguous pages into the last SG */ /* Merge contiguous pages into the last SG */
prv_len = sgt_append->prv->length; prv_len = sgt_append->prv->length;
last_pg = sg_page(sgt_append->prv); if (page_to_pfn(pages[0]) == next_pfn) {
while (n_pages && pages_are_mergeable(pages[0], last_pg)) { last_pg = pfn_to_page(next_pfn - 1);
if (sgt_append->prv->length + PAGE_SIZE > max_segment) while (n_pages && pages_are_mergeable(pages[0], last_pg)) {
break; if (sgt_append->prv->length + PAGE_SIZE > max_segment)
sgt_append->prv->length += PAGE_SIZE; break;
last_pg = pages[0]; sgt_append->prv->length += PAGE_SIZE;
pages++; last_pg = pages[0];
n_pages--; pages++;
n_pages--;
}
if (!n_pages)
goto out;
} }
if (!n_pages)
goto out;
} }
/* compute number of contiguous chunks */ /* compute number of contiguous chunks */