Commit 6094ea64 authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

RDMA: Move DMA block iterator logic into dedicated files 

The DMA iterator logic was mixed into verbs and umem-specific code,
forcing all users to include rdma/ib_umem.h. Move the block iterator
logic into iter.c and rdma/iter.h so that rdma/ib_umem.h and
rdma/ib_verbs.h can be separated in a follow-up patch.

Link: https://patch.msgid.link/20260213-refactor-umem-v1-1-f3be85847922@nvidia.com


Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
parent d1fc91be

drivers/infiniband/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ ib_core-y := packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \ 
				roce_gid_mgmt.o mr_pool.o addr.o sa_query.o \

				multicast.o mad.o smi.o agent.o mad_rmpp.o \

				nldev.o restrack.o counters.o ib_core_uverbs.o \

				trace.o lag.o

				trace.o lag.o iter.o



ib_core-$(CONFIG_SECURITY_INFINIBAND) += security.o

ib_core-$(CONFIG_CGROUP_RDMA) += cgroup.o

drivers/infiniband/core/iter.c

0 → 100644
+43 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

/* Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. */



#include <linux/export.h>

#include <rdma/iter.h>



void __rdma_block_iter_start(struct ib_block_iter *biter,

			     struct scatterlist *sglist, unsigned int nents,

			     unsigned long pgsz)

{

	memset(biter, 0, sizeof(struct ib_block_iter));

	biter->__sg = sglist;

	biter->__sg_nents = nents;



	/* Driver provides best block size to use */

	biter->__pg_bit = __fls(pgsz);

}

EXPORT_SYMBOL(__rdma_block_iter_start);



bool __rdma_block_iter_next(struct ib_block_iter *biter)

{

	unsigned int block_offset;

	unsigned int delta;



	if (!biter->__sg_nents || !biter->__sg)

		return false;



	biter->__dma_addr = sg_dma_address(biter->__sg) + biter->__sg_advance;

	block_offset = biter->__dma_addr & (BIT_ULL(biter->__pg_bit) - 1);

	delta = BIT_ULL(biter->__pg_bit) - block_offset;



	while (biter->__sg_nents && biter->__sg &&

	       sg_dma_len(biter->__sg) - biter->__sg_advance <= delta) {

		delta -= sg_dma_len(biter->__sg) - biter->__sg_advance;

		biter->__sg_advance = 0;

		biter->__sg = sg_next(biter->__sg);

		biter->__sg_nents--;

	}

	biter->__sg_advance += delta;



	return true;

}

EXPORT_SYMBOL(__rdma_block_iter_next);

drivers/infiniband/core/verbs.c

+0 −38
Original line number Diff line number Diff line
@@ -3154,44 +3154,6 @@ int rdma_init_netdev(struct ib_device *device, u32 port_num, 
}

EXPORT_SYMBOL(rdma_init_netdev);



void __rdma_block_iter_start(struct ib_block_iter *biter,

			     struct scatterlist *sglist, unsigned int nents,

			     unsigned long pgsz)

{

	memset(biter, 0, sizeof(struct ib_block_iter));

	biter->__sg = sglist;

	biter->__sg_nents = nents;



	/* Driver provides best block size to use */

	biter->__pg_bit = __fls(pgsz);

}

EXPORT_SYMBOL(__rdma_block_iter_start);



bool __rdma_block_iter_next(struct ib_block_iter *biter)

{

	unsigned int block_offset;

	unsigned int delta;



	if (!biter->__sg_nents || !biter->__sg)

		return false;



	biter->__dma_addr = sg_dma_address(biter->__sg) + biter->__sg_advance;

	block_offset = biter->__dma_addr & (BIT_ULL(biter->__pg_bit) - 1);

	delta = BIT_ULL(biter->__pg_bit) - block_offset;



	while (biter->__sg_nents && biter->__sg &&

	       sg_dma_len(biter->__sg) - biter->__sg_advance <= delta) {

		delta -= sg_dma_len(biter->__sg) - biter->__sg_advance;

		biter->__sg_advance = 0;

		biter->__sg = sg_next(biter->__sg);

		biter->__sg_nents--;

	}

	biter->__sg_advance += delta;



	return true;

}

EXPORT_SYMBOL(__rdma_block_iter_next);



/**

 * rdma_alloc_hw_stats_struct - Helper function to allocate dynamic struct

 *   for the drivers.

drivers/infiniband/hw/bnxt_re/qplib_res.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#include <linux/if_vlan.h>

#include <linux/vmalloc.h>

#include <rdma/ib_verbs.h>

#include <rdma/ib_umem.h>

#include <rdma/iter.h>



#include "roce_hsi.h"

#include "qplib_res.h"

drivers/infiniband/hw/cxgb4/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 


#include <linux/module.h>

#include <linux/moduleparam.h>

#include <rdma/ib_umem.h>

#include <linux/atomic.h>

#include <rdma/ib_user_verbs.h>

#include <rdma/iter.h>



#include "iw_cxgb4.h"