Skip to contentSkip to conversation

EFA cleanups 2019-08-26

PATCH Applied Gal Pressman 2 participants 4 messages Aug 26, 2019 – Aug 27, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover EFA cleanups 2019-08-26

Hello,

This series introduces two minor cleanups for EFA that were hanging around in my local git waiting to be submitted.
The patches are very straight forward, nothing intersting to say about them :)..

Gal Pressman (2):
RDMA/efa: Remove umem check on dereg MR flow
RDMA/efa: Use existing FIELD_SIZEOF macro

 drivers/infiniband/hw/efa/efa_verbs.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
Signature · 1 line
2.22.0
#1 lore raw

PATCH 1/2 RDMA/efa: Remove umem check on dereg MR flow

EFA driver is not a kverbs provider, the check for MR umem is redundant.

---
 drivers/infiniband/hw/efa/efa_verbs.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/infiniband/hw/efa/efa_verbs.c +5 -7
index 70851bd7f801..1e23c621a419 100644
@@ -1500,14 +1500,12 @@ int efa_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata)
 
 	ibdev_dbg(&dev->ibdev, "Deregister mr[%d]\n", ibmr->lkey);
 
-	if (mr->umem) {
-		params.l_key = mr->ibmr.lkey;
-		err = efa_com_dereg_mr(&dev->edev, &params);
-		if (err)
-			return err;
-	}
-	ib_umem_release(mr->umem);
+	params.l_key = mr->ibmr.lkey;
+	err = efa_com_dereg_mr(&dev->edev, &params);
+	if (err)
+		return err;
 
+	ib_umem_release(mr->umem);
 	kfree(mr);
 
 	return 0;
Signature · 1 line
2.22.0
#2 lore raw

PATCH 2/2 RDMA/efa: Use existing FIELD_SIZEOF macro

In reply to Gal Pressman

Use FIELD_SIZEOF macro instead of hard coding it in field_avail macro.

---
 drivers/infiniband/hw/efa/efa_verbs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/efa/efa_verbs.c +1 -1
index 1e23c621a419..4edae89e8e3c 100644
@@ -148,7 +148,7 @@ static inline struct efa_ah *to_eah(struct ib_ah *ibah)
 }
 
 #define field_avail(x, fld, sz) (offsetof(typeof(x), fld) + \
-				 sizeof(((typeof(x) *)0)->fld) <= (sz))
+				 FIELD_SIZEOF(typeof(x), fld) <= (sz))
 
 #define is_reserved_cleared(reserved) \
 	!memchr_inv(reserved, 0, sizeof(reserved))
Signature · 1 line
2.22.0
#3 lore raw
In reply to Gal Pressman
Quoted 10 lines · Gal Pressman

Hello,

This series introduces two minor cleanups for EFA that were hanging around in my local git waiting to be submitted.
The patches are very straight forward, nothing intersting to say about them :)..

Gal Pressman (2):
RDMA/efa: Remove umem check on dereg MR flow
RDMA/efa: Use existing FIELD_SIZEOF macro

Applied to for-next, thanks

Jason