Message ID | 26f79872e78cc643937059003763b5cfc1333167.1536342881.git.yi.z.zhang@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Fix kvm misconceives NVDIMM pages as reserved mmio | expand |
On 2018-09-08 at 02:03:28 +0800, Zhang Yi wrote: > PageReserved() is already checked inside kvm_is_reserved_pfn(), > remove it from kvm_set_pfn_dirty(). > > Signed-off-by: Zhang Yi <yi.z.zhang@linux.intel.com> > Signed-off-by: Zhang Yu <yu.c.zhang@linux.intel.com> > Reviewed-by: David Hildenbrand <david@redhat.com> > Acked-by: Pankaj Gupta <pagupta@redhat.com> > --- > virt/kvm/kvm_main.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 8b47507f..c44c406 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -1690,12 +1690,8 @@ EXPORT_SYMBOL_GPL(kvm_release_pfn_dirty); > > void kvm_set_pfn_dirty(kvm_pfn_t pfn) > { > - if (!kvm_is_reserved_pfn(pfn)) { > - struct page *page = pfn_to_page(pfn); > - > - if (!PageReserved(page)) > - SetPageDirty(page); > - } > + if (!kvm_is_reserved_pfn(pfn)) > + SetPageDirty(pfn_to_page(pfn)); > } > EXPORT_SYMBOL_GPL(kvm_set_pfn_dirty); > > -- > 2.7.4 > Hi Paolo, We will remove the reserved flag in dax pages, then patch 2[3,4]/4 is unnecessary, can we queue this 1/4 to next merge? Thank you very much. Yi
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 8b47507f..c44c406 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1690,12 +1690,8 @@ EXPORT_SYMBOL_GPL(kvm_release_pfn_dirty); void kvm_set_pfn_dirty(kvm_pfn_t pfn) { - if (!kvm_is_reserved_pfn(pfn)) { - struct page *page = pfn_to_page(pfn); - - if (!PageReserved(page)) - SetPageDirty(page); - } + if (!kvm_is_reserved_pfn(pfn)) + SetPageDirty(pfn_to_page(pfn)); } EXPORT_SYMBOL_GPL(kvm_set_pfn_dirty);