From: Roland Dreier <roland@topspin.com>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, openib-general@openib.org
Subject: [PATCH 04/14] IB/mthca: Use dma_alloc_coherent instead of pci_alloc_consistent
Date: Thu, 23 Jun 2005 21:04:20 -0700 [thread overview]
Message-ID: <2005623214.8EmcOxrdtkDFLmDq@topspin.com> (raw)
In-Reply-To: <2005623214.Zy3c64TeILEv3G5E@topspin.com>
Switch all allocations of coherent memory from pci_alloc_consistent()
to dma_alloc_coherent(), so that we can pass GFP_KERNEL. This should
help when the system is low on memory.
Signed-off-by: Roland Dreier <roland@topspin.com>
---
linux.git/drivers/infiniband/hw/mthca/mthca_cq.c | 25 +++++++++++++------------
linux.git/drivers/infiniband/hw/mthca/mthca_eq.c | 12 ++++++------
linux.git/drivers/infiniband/hw/mthca/mthca_qp.c | 19 ++++++++++---------
3 files changed, 29 insertions(+), 27 deletions(-)
--- linux.git.orig/drivers/infiniband/hw/mthca/mthca_cq.c 2005-06-23 13:03:04.326180727 -0700
+++ linux.git/drivers/infiniband/hw/mthca/mthca_cq.c 2005-06-23 13:03:04.752088550 -0700
@@ -636,19 +636,19 @@ static void mthca_free_cq_buf(struct mth
int size;
if (cq->is_direct)
- pci_free_consistent(dev->pdev,
- (cq->ibcq.cqe + 1) * MTHCA_CQ_ENTRY_SIZE,
- cq->queue.direct.buf,
- pci_unmap_addr(&cq->queue.direct,
- mapping));
+ dma_free_coherent(&dev->pdev->dev,
+ (cq->ibcq.cqe + 1) * MTHCA_CQ_ENTRY_SIZE,
+ cq->queue.direct.buf,
+ pci_unmap_addr(&cq->queue.direct,
+ mapping));
else {
size = (cq->ibcq.cqe + 1) * MTHCA_CQ_ENTRY_SIZE;
for (i = 0; i < (size + PAGE_SIZE - 1) / PAGE_SIZE; ++i)
if (cq->queue.page_list[i].buf)
- pci_free_consistent(dev->pdev, PAGE_SIZE,
- cq->queue.page_list[i].buf,
- pci_unmap_addr(&cq->queue.page_list[i],
- mapping));
+ dma_free_coherent(&dev->pdev->dev, PAGE_SIZE,
+ cq->queue.page_list[i].buf,
+ pci_unmap_addr(&cq->queue.page_list[i],
+ mapping));
kfree(cq->queue.page_list);
}
@@ -668,8 +668,8 @@ static int mthca_alloc_cq_buf(struct mth
npages = 1;
shift = get_order(size) + PAGE_SHIFT;
- cq->queue.direct.buf = pci_alloc_consistent(dev->pdev,
- size, &t);
+ cq->queue.direct.buf = dma_alloc_coherent(&dev->pdev->dev,
+ size, &t, GFP_KERNEL);
if (!cq->queue.direct.buf)
return -ENOMEM;
@@ -707,7 +707,8 @@ static int mthca_alloc_cq_buf(struct mth
for (i = 0; i < npages; ++i) {
cq->queue.page_list[i].buf =
- pci_alloc_consistent(dev->pdev, PAGE_SIZE, &t);
+ dma_alloc_coherent(&dev->pdev->dev, PAGE_SIZE,
+ &t, GFP_KERNEL);
if (!cq->queue.page_list[i].buf)
goto err_free;
--- linux.git.orig/drivers/infiniband/hw/mthca/mthca_eq.c 2005-06-23 13:03:03.703315530 -0700
+++ linux.git/drivers/infiniband/hw/mthca/mthca_eq.c 2005-06-23 13:03:04.752088550 -0700
@@ -501,8 +501,8 @@ static int __devinit mthca_create_eq(str
eq_context = MAILBOX_ALIGN(mailbox);
for (i = 0; i < npages; ++i) {
- eq->page_list[i].buf = pci_alloc_consistent(dev->pdev,
- PAGE_SIZE, &t);
+ eq->page_list[i].buf = dma_alloc_coherent(&dev->pdev->dev,
+ PAGE_SIZE, &t, GFP_KERNEL);
if (!eq->page_list[i].buf)
goto err_out_free;
@@ -582,10 +582,10 @@ static int __devinit mthca_create_eq(str
err_out_free:
for (i = 0; i < npages; ++i)
if (eq->page_list[i].buf)
- pci_free_consistent(dev->pdev, PAGE_SIZE,
- eq->page_list[i].buf,
- pci_unmap_addr(&eq->page_list[i],
- mapping));
+ dma_free_coherent(&dev->pdev->dev, PAGE_SIZE,
+ eq->page_list[i].buf,
+ pci_unmap_addr(&eq->page_list[i],
+ mapping));
kfree(eq->page_list);
kfree(dma_list);
--- linux.git.orig/drivers/infiniband/hw/mthca/mthca_qp.c 2005-06-23 13:03:02.079666927 -0700
+++ linux.git/drivers/infiniband/hw/mthca/mthca_qp.c 2005-06-23 13:03:04.751088766 -0700
@@ -934,7 +934,8 @@ static int mthca_alloc_wqe_buf(struct mt
mthca_dbg(dev, "Creating direct QP of size %d (shift %d)\n",
size, shift);
- qp->queue.direct.buf = pci_alloc_consistent(dev->pdev, size, &t);
+ qp->queue.direct.buf = dma_alloc_coherent(&dev->pdev->dev, size,
+ &t, GFP_KERNEL);
if (!qp->queue.direct.buf)
goto err_out;
@@ -973,7 +974,8 @@ static int mthca_alloc_wqe_buf(struct mt
for (i = 0; i < npages; ++i) {
qp->queue.page_list[i].buf =
- pci_alloc_consistent(dev->pdev, PAGE_SIZE, &t);
+ dma_alloc_coherent(&dev->pdev->dev, PAGE_SIZE,
+ &t, GFP_KERNEL);
if (!qp->queue.page_list[i].buf)
goto err_out_free;
@@ -996,16 +998,15 @@ static int mthca_alloc_wqe_buf(struct mt
err_out_free:
if (qp->is_direct) {
- pci_free_consistent(dev->pdev, size,
- qp->queue.direct.buf,
- pci_unmap_addr(&qp->queue.direct, mapping));
+ dma_free_coherent(&dev->pdev->dev, size, qp->queue.direct.buf,
+ pci_unmap_addr(&qp->queue.direct, mapping));
} else
for (i = 0; i < npages; ++i) {
if (qp->queue.page_list[i].buf)
- pci_free_consistent(dev->pdev, PAGE_SIZE,
- qp->queue.page_list[i].buf,
- pci_unmap_addr(&qp->queue.page_list[i],
- mapping));
+ dma_free_coherent(&dev->pdev->dev, PAGE_SIZE,
+ qp->queue.page_list[i].buf,
+ pci_unmap_addr(&qp->queue.page_list[i],
+ mapping));
}
next prev parent reply other threads:[~2005-06-24 4:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-24 4:04 [PATCH 00/14] IB/mthca: merge Roland Dreier
2005-06-24 4:04 ` [PATCH 01/14] IB/mthca: Add Sun copyright notice Roland Dreier
2005-06-24 4:04 ` [PATCH 02/14] IB/mthca: Clean up error messages Roland Dreier
2005-06-24 4:04 ` [PATCH 03/14] IB/mthca: Clean up CQ debug Roland Dreier
2005-06-24 4:04 ` Roland Dreier [this message]
2005-06-24 4:04 ` [PATCH 05/14] IB/mthca: Set QP static rate correctly Roland Dreier
2005-06-24 4:04 ` [PATCH 06/14] IB/mthca: Set RDMA/atomic capabilities correctly Roland Dreier
2005-06-24 4:04 ` [PATCH 07/14] IB/mthca: Enable unreliable connected transport Roland Dreier
2005-06-24 4:04 ` [PATCH 08/14] IB/mthca: Fix memset size Roland Dreier
2005-06-24 4:04 ` [PATCH 09/14] IB/mthca: Move mthca_is_memfree checks Roland Dreier
2005-06-24 4:04 ` [PATCH 10/14] IB/mthca: Split off MTT allocation Roland Dreier
2005-06-24 4:04 ` [PATCH 11/14] IB/mthca: Fix memory leak on error path Roland Dreier
2005-06-24 4:04 ` [PATCH 12/14] IB/mthca: Encapsulate command interface init Roland Dreier
2005-06-24 4:04 ` [PATCH 13/14] IB/mthca: Align FW command mailboxes to 4K Roland Dreier
2005-06-24 4:04 ` [PATCH 14/14] IB/mthca: Bump version Roland Dreier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2005623214.8EmcOxrdtkDFLmDq@topspin.com \
--to=roland@topspin.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=openib-general@openib.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®