xprtrdma: Ensure MRs are DMA-unmapped when posting LOCAL_INV fails

chucklever · amschuma-ntap · commit b674c4b4a13d · 2019-01-02T12:05:16.000-05:00
The recovery case in frwr_op_unmap_sync needs to DMA unmap each MR. frwr_release_mr does not DMA-unmap, but the recycle worker does. Fixes: 61da886 ("xprtrdma: Explicitly resetting MRs is ... ") Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c
@@ -563,8 +563,8 @@ frwr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct list_head *mrs)
 		mr = container_of(frwr, struct rpcrdma_mr, frwr);
 		bad_wr = bad_wr->next;
 
-		list_del(&mr->mr_list);
-		frwr_op_release_mr(mr);
+		list_del_init(&mr->mr_list);
+		rpcrdma_mr_recycle(mr);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -563,8 +563,8 @@ frwr_op_unmap_sync(struct rpcrdma_xprt r_xprt, struct list_head mrs)`
`563`	`563`	`mr = container_of(frwr, struct rpcrdma_mr, frwr);`
`564`	`564`	`bad_wr = bad_wr->next;`
`565`	`565`
`566`		`- list_del(&mr->mr_list);`
`567`		`- frwr_op_release_mr(mr);`
	`566`	`+ list_del_init(&mr->mr_list);`
	`567`	`+ rpcrdma_mr_recycle(mr);`
`568`	`568`	`}`
`569`	`569`	`}`
`570`	`570`