linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peng Fan <peng.fan@nxp.com>
To: "mst@redhat.com" <mst@redhat.com>,
	"jasowang@redhat.com" <jasowang@redhat.com>,
	"sstabellini@kernel.org" <sstabellini@kernel.org>,
	"hch@infradead.org" <hch@infradead.org>
Cc: "virtualization@lists.linux-foundation.org" 
	<virtualization@lists.linux-foundation.org>,
	"xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"linux-remoteproc@vger.kernel.org"
	<linux-remoteproc@vger.kernel.org>, Peng Fan <peng.fan@nxp.com>
Subject: [RFC] virtio_ring: check dma_mem for xen_domain
Date: Mon, 21 Jan 2019 04:51:57 +0000	[thread overview]
Message-ID: <20190121050056.14325-1-peng.fan@nxp.com> (raw)

on i.MX8QM, M4_1 is communicating with DomU using rpmsg with a fixed
address as the dma mem buffer which is predefined.

Without this patch, the flow is:
vring_map_one_sg -> vring_use_dma_api
                 -> dma_map_page
		       -> __swiotlb_map_page
		                ->swiotlb_map_page
				->__dma_map_area(phys_to_virt(dma_to_phys(dev, dev_addr)), size, dir);
However we are using per device dma area for rpmsg, phys_to_virt
could not return a correct virtual address for virtual address in
vmalloc area. Then kernel panic.

With this patch, vring_use_dma_api will return false, and
vring_map_one_sg will return sg_phys(sg) which is the correct phys
address in the predefined memory region.
vring_map_one_sg -> vring_use_dma_api
                 -> sg_phys(sg)

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/virtio/virtio_ring.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index cd7e755484e3..8993d7cb3592 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -248,6 +248,8 @@ static inline bool virtqueue_use_indirect(struct virtqueue *_vq,
 
 static bool vring_use_dma_api(struct virtio_device *vdev)
 {
+	struct device *dma_dev = vdev->dev.parent;
+
 	if (!virtio_has_iommu_quirk(vdev))
 		return true;
 
@@ -260,7 +262,7 @@ static bool vring_use_dma_api(struct virtio_device *vdev)
 	 * the DMA API if we're a Xen guest, which at least allows
 	 * all of the sensible Xen configurations to work correctly.
 	 */
-	if (xen_domain())
+	if (xen_domain() && !dma_dev->dma_mem)
 		return true;
 
 	return false;
-- 
2.14.1


             reply	other threads:[~2019-01-21  7:16 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-21  4:51 Peng Fan [this message]
2019-01-21  8:28 ` [RFC] virtio_ring: check dma_mem for xen_domain hch
2019-01-22  2:32   ` Peng Fan
2019-01-22  2:36   ` Michael S. Tsirkin
2019-01-22 19:59 ` [Xen-devel] " Stefano Stabellini
2019-01-23  2:57   ` Michael S. Tsirkin
2019-01-23  7:12   ` hch
2019-01-23 21:04     ` Stefano Stabellini
2019-01-23 21:14       ` hch
2019-01-23 23:43         ` Stefano Stabellini
2019-01-24  6:47           ` Peng Fan
2019-01-24 19:14             ` Stefano Stabellini
2019-01-24 20:34               ` Michael S. Tsirkin
2019-01-25  9:45         ` Peng Fan
2019-01-25 19:18           ` Stefano Stabellini
2019-01-28  8:00           ` hch
2019-01-29  9:26             ` Peng Fan
2019-01-24  6:42   ` Peng Fan

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=20190121050056.14325-1-peng.fan@nxp.com \
    --to=peng.fan@nxp.com \
    --cc=hch@infradead.org \
    --cc=jasowang@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-remoteproc@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=sstabellini@kernel.org \
    --cc=virtualization@lists.linux-foundation.org \
    --cc=xen-devel@lists.xenproject.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;
as well as URLs for NNTP newsgroup(s).