linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: mst@redhat.com, jasowang@redhat.com, kvm@vger.kernel.org,
	virtualization@lists.linux-foundation.org,
	netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, jgg@ziepe.ca
Subject: [PATCH V2 5/9] vhost: mark dirty pages during map uninit
Date: Wed, 31 Jul 2019 04:46:51 -0400	[thread overview]
Message-ID: <20190731084655.7024-6-jasowang@redhat.com> (raw)
In-Reply-To: <20190731084655.7024-1-jasowang@redhat.com>

We don't mark dirty pages if the map was teared down outside MMU
notifier. This will lead untracked dirty pages. Fixing by marking
dirty pages during map uninit.

Reported-by: Michael S. Tsirkin <mst@redhat.com>
Fixes: 7f466032dc9e ("vhost: access vq metadata through kernel virtual address")
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 drivers/vhost/vhost.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 2a7217c33668..c12cdadb0855 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -305,6 +305,18 @@ static void vhost_map_unprefetch(struct vhost_map *map)
 	kfree(map);
 }
 
+static void vhost_set_map_dirty(struct vhost_virtqueue *vq,
+				struct vhost_map *map, int index)
+{
+	struct vhost_uaddr *uaddr = &vq->uaddrs[index];
+	int i;
+
+	if (uaddr->write) {
+		for (i = 0; i < map->npages; i++)
+			set_page_dirty(map->pages[i]);
+	}
+}
+
 static void vhost_uninit_vq_maps(struct vhost_virtqueue *vq)
 {
 	struct vhost_map *map[VHOST_NUM_ADDRS];
@@ -314,8 +326,10 @@ static void vhost_uninit_vq_maps(struct vhost_virtqueue *vq)
 	for (i = 0; i < VHOST_NUM_ADDRS; i++) {
 		map[i] = rcu_dereference_protected(vq->maps[i],
 				  lockdep_is_held(&vq->mmu_lock));
-		if (map[i])
+		if (map[i]) {
+			vhost_set_map_dirty(vq, map[i], i);
 			rcu_assign_pointer(vq->maps[i], NULL);
+		}
 	}
 	spin_unlock(&vq->mmu_lock);
 
@@ -353,7 +367,6 @@ static void vhost_invalidate_vq_start(struct vhost_virtqueue *vq,
 {
 	struct vhost_uaddr *uaddr = &vq->uaddrs[index];
 	struct vhost_map *map;
-	int i;
 
 	if (!vhost_map_range_overlap(uaddr, start, end))
 		return;
@@ -364,10 +377,7 @@ static void vhost_invalidate_vq_start(struct vhost_virtqueue *vq,
 	map = rcu_dereference_protected(vq->maps[index],
 					lockdep_is_held(&vq->mmu_lock));
 	if (map) {
-		if (uaddr->write) {
-			for (i = 0; i < map->npages; i++)
-				set_page_dirty(map->pages[i]);
-		}
+		vhost_set_map_dirty(vq, map, index);
 		rcu_assign_pointer(vq->maps[index], NULL);
 	}
 	spin_unlock(&vq->mmu_lock);
-- 
2.18.1


  parent reply	other threads:[~2019-07-31  8:47 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-31  8:46 [PATCH V2 0/9] Fixes for metadata accelreation Jason Wang
2019-07-31  8:46 ` [PATCH V2 1/9] vhost: don't set uaddr for invalid address Jason Wang
2019-07-31  8:46 ` [PATCH V2 2/9] vhost: validate MMU notifier registration Jason Wang
2019-07-31  8:46 ` [PATCH V2 3/9] vhost: fix vhost map leak Jason Wang
2019-07-31  8:46 ` [PATCH V2 4/9] vhost: reset invalidate_count in vhost_set_vring_num_addr() Jason Wang
2019-07-31 12:41   ` Jason Gunthorpe
2019-07-31 13:29     ` Jason Wang
2019-07-31 19:32       ` Jason Gunthorpe
2019-07-31 19:37         ` Michael S. Tsirkin
2019-08-01  5:03         ` Jason Wang
2019-07-31  8:46 ` Jason Wang [this message]
2019-07-31  8:46 ` [PATCH V2 6/9] vhost: don't do synchronize_rcu() in vhost_uninit_vq_maps() Jason Wang
2019-07-31  8:46 ` [PATCH V2 7/9] vhost: do not use RCU to synchronize MMU notifier with worker Jason Wang
2019-07-31  8:50   ` Jason Wang
2019-07-31 12:39   ` Jason Gunthorpe
2019-07-31 13:28     ` Jason Wang
2019-07-31 19:30       ` Jason Gunthorpe
2019-08-01  5:02         ` Jason Wang
2019-08-01 14:15           ` Jason Gunthorpe
2019-08-02  9:40             ` Jason Wang
2019-08-02 12:46               ` Jason Gunthorpe
2019-08-02 14:27                 ` Michael S. Tsirkin
2019-08-02 17:24                   ` Jason Gunthorpe
2019-08-03 21:36                     ` Michael S. Tsirkin
2019-08-04  0:14                       ` Jason Gunthorpe
2019-08-04  8:07                         ` Michael S. Tsirkin
2019-08-05  4:39                           ` Jason Wang
2019-08-06 11:53                           ` Jason Gunthorpe
2019-08-06 13:36                             ` Michael S. Tsirkin
2019-08-06 13:40                               ` Jason Gunthorpe
2019-08-05  4:36                   ` Jason Wang
2019-08-05  4:41                     ` Jason Wang
2019-08-05  6:40                       ` Michael S. Tsirkin
2019-08-05  8:24                         ` Jason Wang
2019-08-05  6:30                     ` Michael S. Tsirkin
2019-08-05  8:22                       ` Jason Wang
2019-08-05  4:20                 ` Jason Wang
2019-08-06 12:04                   ` Jason Gunthorpe
2019-08-07  6:49                     ` Jason Wang
2019-08-02 14:03               ` Michael S. Tsirkin
2019-08-05  4:33                 ` Jason Wang
2019-08-05  6:28                   ` Michael S. Tsirkin
2019-08-05  8:21                     ` Jason Wang
2019-07-31 18:29   ` Michael S. Tsirkin
2019-08-01  8:06     ` Jason Wang
2019-08-03 21:54       ` Michael S. Tsirkin
2019-08-05  8:18         ` Jason Wang
2019-07-31  8:46 ` [PATCH V2 8/9] vhost: correctly set dirty pages in MMU notifiers callback Jason Wang
2019-07-31  8:46 ` [PATCH V2 9/9] vhost: do not return -EAGIAN for non blocking invalidation too early Jason Wang
2019-07-31  9:59   ` Stefano Garzarella
2019-07-31 10:05     ` Jason Wang

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=20190731084655.7024-6-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=jgg@ziepe.ca \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=virtualization@lists.linux-foundation.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).