Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7922f7d authored by Mitko Haralanov's avatar Mitko Haralanov Committed by Doug Ledford
Browse files

IB/hfi1: Switch to using the pin query function 



Use the new function to query whether the expected receive
user buffer can be pinned successfully. This requires that
a new variable be added to the hfi1_filedata structure used
to hold the number of pages pinned by the expected receive
code.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarMitko Haralanov <mitko.haralanov@intel.com>
Signed-off-by: default avatarJubin John <jubin.john@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent bd3a8947

drivers/staging/rdma/hfi1/hfi.h

+1 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,7 @@ struct hfi1_filedata { 
	struct hfi1_user_sdma_pkt_q *pq;

	/* for cpu affinity; -1 if none */

	int rec_cpu_num;

	u32 tid_n_pinned;

	struct rb_root tid_rb_root;

	struct tid_rb_node **entry_to_rb;

	spinlock_t tid_lock; /* protect tid_[limit,used] counters */

drivers/staging/rdma/hfi1/user_exp_rcv.c

+7 −1
Original line number Diff line number Diff line
@@ -396,11 +396,14 @@ int hfi1_user_exp_rcv_setup(struct file *fp, struct hfi1_tid_info *tinfo) 
	 * pages, accept the amount pinned so far and program only that.

	 * User space knows how to deal with partially programmed buffers.

	 */

	if (!hfi1_can_pin_pages(dd, fd->tid_n_pinned, npages))

		return -ENOMEM;

	pinned = hfi1_acquire_user_pages(vaddr, npages, true, pages);

	if (pinned <= 0) {

		ret = pinned;

		goto bail;

	}

	fd->tid_n_pinned += npages;



	/* Find sets of physically contiguous pages */

	npagesets = find_phys_blocks(pages, pinned, pagesets);
@@ -549,10 +552,12 @@ int hfi1_user_exp_rcv_setup(struct file *fp, struct hfi1_tid_info *tinfo) 
	 * If not everything was mapped (due to insufficient RcvArray entries,

	 * for example), unpin all unmapped pages so we can pin them nex time.

	 */

	if (mapped_pages != pinned)

	if (mapped_pages != pinned) {

		hfi1_release_user_pages(current->mm, &pages[mapped_pages],

					pinned - mapped_pages,

					false);

		fd->tid_n_pinned -= pinned - mapped_pages;

	}

bail:

	kfree(pagesets);

	kfree(pages);
@@ -924,6 +929,7 @@ static void clear_tid_node(struct hfi1_filedata *fd, u16 subctxt, 
	pci_unmap_single(dd->pcidev, node->dma_addr, node->mmu.len,

			 PCI_DMA_FROMDEVICE);

	hfi1_release_user_pages(current->mm, node->pages, node->npages, true);

	fd->tid_n_pinned -= node->npages;



	node->grp->used--;

	node->grp->map &= ~(1 << (node->rcventry - node->grp->base));