From bb55bde4e6b510ecfa9b04e200e68492a0d70faf Mon Sep 17 00:00:00 2001 From: Huang Ying Date: Tue, 22 Jun 2010 14:23:11 +0800 Subject: [PATCH] --- yaml --- r: 202367 b: refs/heads/master c: bbeb34062fbad287c949a945a516a0c15b179993 h: refs/heads/master i: 202365: 2894a0e214cd340187c1692eb3f8aba1f964f7d0 202363: 3a6641475933344291ea071a9adbcda358e7ddee 202359: a43e1e4123889cb99d990830f7ba4735ec5f8a82 202351: 6d58b3a85cdd119b939f615a63b1c938cb8d4de5 202335: b3703c6bcaa1ac839cc7b214421878d0a96aaa04 202303: 8dc147cba84aff842a57a79d9fbd4ae25df57618 202239: 87e0a6811ebde81333129db99ad5ffa86a14dea2 v: v3 --- [refs] | 2 +- trunk/mm/memory-failure.c | 3 +++ trunk/virt/kvm/kvm_main.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 04ef04113848..d26f76060dbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c3f6041172b78d5532c6bf3680d304e92ec2e66 +refs/heads/master: bbeb34062fbad287c949a945a516a0c15b179993 diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c index 378b0f61fd3c..6b44e52cacaa 100644 --- a/trunk/mm/memory-failure.c +++ b/trunk/mm/memory-failure.c @@ -1298,6 +1298,9 @@ int soft_offline_page(struct page *page, int flags) return ret; } +/* + * The caller must hold current->mm->mmap_sem in read mode. + */ int is_hwpoison_address(unsigned long addr) { pgd_t *pgdp; diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c index 74f731920945..ec2e3c6ac7ed 100644 --- a/trunk/virt/kvm/kvm_main.c +++ b/trunk/virt/kvm/kvm_main.c @@ -947,12 +947,13 @@ static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr) if (unlikely(npages != 1)) { struct vm_area_struct *vma; + down_read(¤t->mm->mmap_sem); if (is_hwpoison_address(addr)) { + up_read(¤t->mm->mmap_sem); get_page(hwpoison_page); return page_to_pfn(hwpoison_page); } - down_read(¤t->mm->mmap_sem); vma = find_vma(current->mm, addr); if (vma == NULL || addr < vma->vm_start ||