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

Commit acaea9ee authored by Jack Morgenstein's avatar Jack Morgenstein Committed by Roland Dreier
Browse files

IB/core: Fix SM LID/LID change with client reregister set 



After commit 12bbb2b7, when SM LID
change or LID change MAD also has a client reregistration bit set,
only CLIENT_REREGISTER event is generated.

As a result, the sa_query module and the cache module don't update the
port information, and ULPs (e.g. IPoIB) stop working.  This is the
regression we observe as compared to 2.6.17.

Rather than generate multiple events (which would have negative
performance impact), let us simply let cache and SA query respond to
reregister event in the same way as to LID and SM change events.

Signed-off-by: default avatarJack Morgenstein <jackm@mellanox.co.il>
Signed-off-by: default avatarMichael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent a19aa5c5

drivers/infiniband/core/cache.c

+2 −1
Original line number Diff line number Diff line
@@ -301,7 +301,8 @@ static void ib_cache_event(struct ib_event_handler *handler, 
	    event->event == IB_EVENT_PORT_ACTIVE ||

	    event->event == IB_EVENT_LID_CHANGE  ||

	    event->event == IB_EVENT_PKEY_CHANGE ||

	    event->event == IB_EVENT_SM_CHANGE) {

	    event->event == IB_EVENT_SM_CHANGE   ||

	    event->event == IB_EVENT_CLIENT_REREGISTER) {

		work = kmalloc(sizeof *work, GFP_ATOMIC);

		if (work) {

			INIT_WORK(&work->work, ib_cache_task, work);

drivers/infiniband/core/sa_query.c

+2 −1
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ static void ib_sa_event(struct ib_event_handler *handler, struct ib_event *event 
	    event->event == IB_EVENT_PORT_ACTIVE ||

	    event->event == IB_EVENT_LID_CHANGE  ||

	    event->event == IB_EVENT_PKEY_CHANGE ||

	    event->event == IB_EVENT_SM_CHANGE) {

	    event->event == IB_EVENT_SM_CHANGE   ||

	    event->event == IB_EVENT_CLIENT_REREGISTER) {

		struct ib_sa_device *sa_dev;

		sa_dev = container_of(handler, typeof(*sa_dev), event_handler);