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

Commit ed71e86a authored by Kaike Wan's avatar Kaike Wan Committed by Jason Gunthorpe
Browse files

IB/hfi1: Rename exp_lock to exp_mutex 



The mutex exp_lock in struct hfi1_ctxtdata is used to protect all
Expected TID data of a user context. This patch renames it to exp_mutex
to better reflect its identity and prepare for upcoming patches.

Reviewed-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarHarish Chegondi <harish.chegondi@intel.com>
Signed-off-by: default avatarKaike Wan <kaike.wan@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent dc2b2a91

drivers/infiniband/hw/hfi1/hfi.h

+2 −2
Original line number Diff line number Diff line
@@ -245,8 +245,8 @@ struct hfi1_ctxtdata { 
	struct exp_tid_set tid_used_list;

	struct exp_tid_set tid_full_list;



	/* lock protecting all Expected TID data */

	struct mutex exp_lock;

	/* lock protecting all Expected TID data of user contexts */

	struct mutex exp_mutex;

	/* per-context configuration flags */

	unsigned long flags;

	/* per-context event flags for fileops/intr communication */

drivers/infiniband/hw/hfi1/init.c

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ int hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, int numa, 
		rcd->numa_id = numa;

		rcd->rcv_array_groups = dd->rcv_entries.ngroups;



		mutex_init(&rcd->exp_lock);

		mutex_init(&rcd->exp_mutex);



		hfi1_cdbg(PROC, "setting up context %u\n", rcd->ctxt);

drivers/infiniband/hw/hfi1/user_exp_rcv.c

+5 −5
Original line number Diff line number Diff line 
/*

 * Copyright(c) 2015-2017 Intel Corporation.

 * Copyright(c) 2015-2018 Intel Corporation.

 *

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.
@@ -375,7 +375,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, 
	 * From this point on, we are going to be using shared (between master

	 * and subcontexts) context resources. We need to take the lock.

	 */

	mutex_lock(&uctxt->exp_lock);

	mutex_lock(&uctxt->exp_mutex);

	/*

	 * The first step is to program the RcvArray entries which are complete

	 * groups.
@@ -461,7 +461,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, 
		}

	}

unlock:

	mutex_unlock(&uctxt->exp_lock);

	mutex_unlock(&uctxt->exp_mutex);

nomem:

	hfi1_cdbg(TID, "total mapped: tidpairs:%u pages:%u (%d)", tididx,

		  mapped_pages, ret);
@@ -517,7 +517,7 @@ int hfi1_user_exp_rcv_clear(struct hfi1_filedata *fd, 
	if (IS_ERR(tidinfo))

		return PTR_ERR(tidinfo);



	mutex_lock(&uctxt->exp_lock);

	mutex_lock(&uctxt->exp_mutex);

	for (tididx = 0; tididx < tinfo->tidcnt; tididx++) {

		ret = unprogram_rcvarray(fd, tidinfo[tididx], NULL);

		if (ret) {
@@ -530,7 +530,7 @@ int hfi1_user_exp_rcv_clear(struct hfi1_filedata *fd, 
	fd->tid_used -= tididx;

	spin_unlock(&fd->tid_lock);

	tinfo->tidcnt = tididx;

	mutex_unlock(&uctxt->exp_lock);

	mutex_unlock(&uctxt->exp_mutex);



	kfree(tidinfo);

	return ret;