History

Merge tag 'for-gkh' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

Doug writes: "RDMA fixes: Final for-rc pull request for 4.19 We only have one bug to submit this time around. It fixes a DMA unmap issue where we unmapped the DMA address from the IOMMU before we did from the card, resulting in a DMAR error with IOMMU enabled, or possible crash without." * tag 'for-gkh' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: IB/mlx5: Unmap DMA addr from HCA before IOMMU

Greg Kroah-Hartman committed 8 years ago

Commit c7891742 parents eb81bfb dd9a4031 file · +8 −4Browse files

Unified · Split

drivers/infiniband/hw/mlx5/mr.c+8−4
@@ -544,6 +544,9 @@ void mlx5_mr_cache_free(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr) · 543 unmodified lines
544544 int shrink = 0;
545545 int c;
546546
547+ if (!mr->allocated_from_cache)
548+ return;
549+
547550 c = order2idx(dev, mr->order);
548551 if (c < 0 || c >= MAX_MR_CACHE_ENTRIES) {
549552 mlx5_ib_warn(dev, "order %d, cache index %d\n", mr->order, c);
@@ -1647,18 +1650,19 @@ static void dereg_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr) · 1097 unmodified lines
16471650 umem = NULL;
16481651 }
16491652 #endif
1650−
16511653 clean_mr(dev, mr);
16521654
1655+ /*
1656+ * We should unregister the DMA address from the HCA before
1657+ * remove the DMA mapping.
1658+ */
1659+ mlx5_mr_cache_free(dev, mr);
16531660 if (umem) {
16541661 ib_umem_release(umem);
16551662 atomic_sub(npages, &dev->mdev->priv.reg_pages);
16561663 }
1657−
16581664 if (!mr->allocated_from_cache)
16591665 kfree(mr);
1660− else
1661− mlx5_mr_cache_free(dev, mr);
16621666 }
16631667
16641668 int mlx5_ib_dereg_mr(struct ib_mr *ibmr)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t