Fix mismerge in OFED update
ClosedPublic
Actions

Authored by rstone on Jan 29 2021, 8:52 PM.

Details

Reviewers

• hselasky
kib

Commits

rG9661887500f8: Fix mismerge in OFED update
rG8a06ca2f734c: Fix mismerge in OFED update

Summary

When OFED was upgraded to Linux v4.9, a bunch of Linux-specific
netlink changes were dropped. Unfortunately, there was a mismerge
in this process and as a result ib_sa_cancel_query() would fail to
cancel an outstanding MAD.

This was causing rdma_destroy_id() to hang indefinitely waiting
for the MAD to complete and release the final reference.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

rstone created this revision.Jan 29 2021, 8:52 PM

Herald added a subscriber: imp. · View Herald TranscriptJan 29 2021, 8:52 PM

rstone requested review of this revision.Jan 29 2021, 8:52 PM

Harbormaster completed remote builds in B36614: Diff 83123.Jan 29 2021, 8:52 PM

I'll have a look at this tomorrow.

Thank you!

--HPS

Targetting a review for Monday.

Looks good.

Please don't forget to MFC to 13-, 12- and 11 -stable.

--HPS

This revision is now accepted and ready to land.Feb 1 2021, 2:18 PM

• hselasky added a reviewer: kib.Feb 1 2021, 2:19 PM

kib accepted this revision.Feb 1 2021, 3:17 PM

Closed by commit rG8a06ca2f734c: Fix mismerge in OFED update (authored by rstone). · Explain WhyFeb 4 2021, 6:58 PM

This revision was automatically updated to reflect the committed changes.

rstone added a commit: rG8a06ca2f734c: Fix mismerge in OFED update.

• hselasky added a commit: rG9661887500f8: Fix mismerge in OFED update.Jul 26 2021, 4:16 PM

Revision Contents
Changeset List

Path

Size

sys/

ofed/

drivers/

infiniband/

core/

ib_sa_query.c

2 lines

Diff 83370

View Options

sys/ofed/drivers/infiniband/core/ib_sa_query.c

Fix mismerge in OFED updateClosedPublicActions