Skip to content

Commit b9c0bec

Browse files
metze-sambasmfrench
authored andcommitted
smb: client: call ib_dma_unmap_sg if mr->sgt.nents is not 0
This seems to be the more reliable way to check if we need to call ib_dma_unmap_sg(). Fixes: c739858 ("CIFS: SMBD: Implement RDMA memory registration") Cc: Steve French <[email protected]> Cc: Tom Talpey <[email protected]> Cc: Long Li <[email protected]> Cc: Namjae Jeon <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Stefan Metzmacher <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 56c817e commit b9c0bec

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

fs/smb/client/smbdirect.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2365,9 +2365,8 @@ static void destroy_mr_list(struct smbdirect_socket *sc)
23652365
spin_unlock_irqrestore(&sc->mr_io.all.lock, flags);
23662366

23672367
list_for_each_entry_safe(mr, tmp, &all_list, list) {
2368-
if (mr->state == SMBDIRECT_MR_INVALIDATED)
2369-
ib_dma_unmap_sg(sc->ib.dev, mr->sgt.sgl,
2370-
mr->sgt.nents, mr->dir);
2368+
if (mr->sgt.nents)
2369+
ib_dma_unmap_sg(sc->ib.dev, mr->sgt.sgl, mr->sgt.nents, mr->dir);
23712370
ib_dereg_mr(mr->mr);
23722371
kfree(mr->sgt.sgl);
23732372
list_del(&mr->list);
@@ -2589,6 +2588,7 @@ struct smbdirect_mr_io *smbd_register_mr(struct smbd_connection *info,
25892588
ib_dma_unmap_sg(sc->ib.dev, mr->sgt.sgl, mr->sgt.nents, mr->dir);
25902589

25912590
dma_map_error:
2591+
mr->sgt.nents = 0;
25922592
mr->state = SMBDIRECT_MR_ERROR;
25932593
if (atomic_dec_and_test(&sc->mr_io.used.count))
25942594
wake_up(&sc->mr_io.cleanup.wait_queue);
@@ -2651,8 +2651,12 @@ void smbd_deregister_mr(struct smbdirect_mr_io *mr)
26512651
*/
26522652
mr->state = SMBDIRECT_MR_INVALIDATED;
26532653

2654-
if (mr->state == SMBDIRECT_MR_INVALIDATED) {
2654+
if (mr->sgt.nents) {
26552655
ib_dma_unmap_sg(sc->ib.dev, mr->sgt.sgl, mr->sgt.nents, mr->dir);
2656+
mr->sgt.nents = 0;
2657+
}
2658+
2659+
if (mr->state == SMBDIRECT_MR_INVALIDATED) {
26562660
mr->state = SMBDIRECT_MR_READY;
26572661
if (atomic_inc_return(&sc->mr_io.ready.count) == 1)
26582662
wake_up(&sc->mr_io.ready.wait_queue);

0 commit comments

Comments
 (0)