Skip to content

Commit 0afec5e

Browse files
YonatanNachumrleon
authored andcommitted
RDMA/core: Fix ib block iterator counter overflow
When registering a new DMA MR after selecting the best aligned page size for it, we iterate over the given sglist to split each entry to smaller, aligned to the selected page size, DMA blocks. In given circumstances where the sg entry and page size fit certain sizes and the sg entry is not aligned to the selected page size, the total size of the aligned pages we need to cover the sg entry is >= 4GB. Under this circumstances, while iterating page aligned blocks, the counter responsible for counting how much we advanced from the start of the sg entry is overflowed because its type is u32 and we pass 4GB in size. This can lead to an infinite loop inside the iterator function because the overflow prevents the counter to be larger than the size of the sg entry. Fix the presented problem by changing the advancement condition to eliminate overflow. Backtrace: [ 192.374329] efa_reg_user_mr_dmabuf [ 192.376783] efa_register_mr [ 192.382579] pgsz_bitmap 0xfffff000 rounddown 0x80000000 [ 192.386423] pg_sz [0x80000000] umem_length[0xc0000000] [ 192.392657] start 0x0 length 0xc0000000 params.page_shift 31 params.page_num 3 [ 192.399559] hp_cnt[3], pages_in_hp[524288] [ 192.403690] umem->sgt_append.sgt.nents[1] [ 192.407905] number entries: [1], pg_bit: [31] [ 192.411397] biter->__sg_nents [1] biter->__sg [0000000008b0c5d8] [ 192.415601] biter->__sg_advance [665837568] sg_dma_len[3221225472] [ 192.419823] biter->__sg_nents [1] biter->__sg [0000000008b0c5d8] [ 192.423976] biter->__sg_advance [2813321216] sg_dma_len[3221225472] [ 192.428243] biter->__sg_nents [1] biter->__sg [0000000008b0c5d8] [ 192.432397] biter->__sg_advance [665837568] sg_dma_len[3221225472] Fixes: a808273 ("RDMA/verbs: Add a DMA iterator to return aligned contiguous memory blocks") Signed-off-by: Yonatan Nachum <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Leon Romanovsky <[email protected]>
1 parent 1aefe5c commit 0afec5e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/infiniband/core/verbs.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2957,15 +2957,18 @@ EXPORT_SYMBOL(__rdma_block_iter_start);
29572957
bool __rdma_block_iter_next(struct ib_block_iter *biter)
29582958
{
29592959
unsigned int block_offset;
2960+
unsigned int sg_delta;
29602961

29612962
if (!biter->__sg_nents || !biter->__sg)
29622963
return false;
29632964

29642965
biter->__dma_addr = sg_dma_address(biter->__sg) + biter->__sg_advance;
29652966
block_offset = biter->__dma_addr & (BIT_ULL(biter->__pg_bit) - 1);
2966-
biter->__sg_advance += BIT_ULL(biter->__pg_bit) - block_offset;
2967+
sg_delta = BIT_ULL(biter->__pg_bit) - block_offset;
29672968

2968-
if (biter->__sg_advance >= sg_dma_len(biter->__sg)) {
2969+
if (sg_dma_len(biter->__sg) - biter->__sg_advance > sg_delta) {
2970+
biter->__sg_advance += sg_delta;
2971+
} else {
29692972
biter->__sg_advance = 0;
29702973
biter->__sg = sg_next(biter->__sg);
29712974
biter->__sg_nents--;

0 commit comments

Comments
 (0)