Commit d9c1b4f5 authored by Dean Luick's avatar Dean Luick Committed by zhaoxiaoqiang11
Browse files

IB/hfi1: Assign npages earlier 

stable inclusion
from stable-v5.10.171
commit 065f6a66339226fe33d18998afa8533076751444
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7V9QX

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=065f6a66339226fe33d18998afa8533076751444



----------------------------------------------------

[ Upstream commit f9c47b2c ]

Improve code clarity and enable earlier use of
tidbuf->npages by moving its assignment to
structure creation time.

Signed-off-by: default avatarDean Luick <dean.luick@cornelisnetworks.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
Link: https://lore.kernel.org/r/167329104884.1472990.4639750192433251493.stgit@awfm-02.cornelisnetworks.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarzhaoxiaoqiang11 <zhaoxiaoqiang11@jd.com>
parent 70cd34dc

drivers/infiniband/hw/hfi1/user_exp_rcv.c

+2 −7
Original line number Diff line number Diff line
@@ -202,16 +202,11 @@ static void unpin_rcv_pages(struct hfi1_filedata *fd, 
static int pin_rcv_pages(struct hfi1_filedata *fd, struct tid_user_buf *tidbuf)

{

	int pinned;

	unsigned int npages;

	unsigned int npages = tidbuf->npages;

	unsigned long vaddr = tidbuf->vaddr;

	struct page **pages = NULL;

	struct hfi1_devdata *dd = fd->uctxt->dd;



	/* Get the number of pages the user buffer spans */

	npages = num_user_pages(vaddr, tidbuf->length);

	if (!npages)

		return -EINVAL;



	if (npages > fd->uctxt->expected_count) {

		dd_dev_err(dd, "Expected buffer too big\n");

		return -EINVAL;
@@ -238,7 +233,6 @@ static int pin_rcv_pages(struct hfi1_filedata *fd, struct tid_user_buf *tidbuf) 
		return pinned;

	}

	tidbuf->pages = pages;

	tidbuf->npages = npages;

	fd->tid_n_pinned += pinned;

	return pinned;

}
@@ -316,6 +310,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, 
	mutex_init(&tidbuf->cover_mutex);

	tidbuf->vaddr = tinfo->vaddr;

	tidbuf->length = tinfo->length;

	tidbuf->npages = num_user_pages(tidbuf->vaddr, tidbuf->length);

	tidbuf->psets = kcalloc(uctxt->expected_count, sizeof(*tidbuf->psets),

				GFP_KERNEL);

	if (!tidbuf->psets) {