diff for duplicates of <20200206021714.GB7631@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 37e4dad..112dc7a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -114,7 +114,7 @@ out_free: for (i = 0; i < KVM_NR_PAGE_SIZES; ++i) { kvfree(slot->arch.rmap[i]); slot->arch.rmap[i] = NULL; - if (i = 0) + if (i == 0) continue; kvfree(slot->arch.lpage_info[i - 1]); @@ -134,7 +134,7 @@ out_free: > > > > const struct kvm_userspace_memory_region *mem, > > > > enum kvm_mr_change change) > > > > { -> > > > + if (change = KVM_MR_MOVE) +> > > > + if (change == KVM_MR_MOVE) > > > > + return kvm_arch_create_memslot(kvm, memslot, > > > > + mem->memory_size >> PAGE_SHIFT); > > > > + @@ -150,8 +150,8 @@ out_free: > > > new.dirty_bitmap = NULL; > > > > > > r = -ENOMEM; -> > > - if (change = KVM_MR_CREATE) { -> > > + if (change = KVM_MR_CREATE || change = KVM_MR_MOVE) { +> > > - if (change == KVM_MR_CREATE) { +> > > + if (change == KVM_MR_CREATE || change == KVM_MR_MOVE) { > > > new.userspace_addr = mem->userspace_addr; > > > > > > if (kvm_arch_create_memslot(kvm, &new, npages)) @@ -180,4 +180,8 @@ memory due to overwriting slot->arch.rmap with a new allocation. > > -- > Peter Xu -> +> +_______________________________________________ +kvmarm mailing list +kvmarm@lists.cs.columbia.edu +https://lists.cs.columbia.edu/mailman/listinfo/kvmarm diff --git a/a/content_digest b/N1/content_digest index be2da86..0d42866 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,29 +5,25 @@ "ref\020200206020031.GJ387680@xz-x1\0" "From\0Sean Christopherson <sean.j.christopherson@intel.com>\0" "Subject\0Re: [PATCH v5 01/19] KVM: x86: Allocate new rmap and large page tracking when moving memslot\0" - "Date\0Thu, 06 Feb 2020 02:17:15 +0000\0" + "Date\0Wed, 5 Feb 2020 18:17:15 -0800\0" "To\0Peter Xu <peterx@redhat.com>\0" - "Cc\0Paolo Bonzini <pbonzini@redhat.com>" + "Cc\0Wanpeng Li <wanpengli@tencent.com>" + kvm@vger.kernel.org + David Hildenbrand <david@redhat.com> + linux-mips@vger.kernel.org Paul Mackerras <paulus@ozlabs.org> - Christian Borntraeger <borntraeger@de.ibm.com> + kvmarm@lists.cs.columbia.edu Janosch Frank <frankja@linux.ibm.com> - David Hildenbrand <david@redhat.com> - Cornelia Huck <cohuck@redhat.com> - Vitaly Kuznetsov <vkuznets@redhat.com> - Wanpeng Li <wanpengli@tencent.com> - Jim Mattson <jmattson@google.com> - Joerg Roedel <joro@8bytes.org> Marc Zyngier <maz@kernel.org> - James Morse <james.morse@arm.com> - Julien Thierry <julien.thierry.kdev@gmail.com> - Suzuki K Poulose <suzuki.poulose@arm.com> - linux-mips@vger.kernel.org - kvm@vger.kernel.org + Joerg Roedel <joro@8bytes.org> + Christian Borntraeger <borntraeger@de.ibm.com> kvm-ppc@vger.kernel.org linux-arm-kernel@lists.infradead.org - kvmarm@lists.cs.columbia.edu + Jim Mattson <jmattson@google.com> + Cornelia Huck <cohuck@redhat.com> linux-kernel@vger.kernel.org - Christoffer Dall <christoffer.dall@arm.com> + Paolo Bonzini <pbonzini@redhat.com> + Vitaly Kuznetsov <vkuznets@redhat.com> " Philippe Mathieu-Daud\303\251 <f4bug@amsat.org>\0" "\00:1\0" "b\0" @@ -147,7 +143,7 @@ "\tfor (i = 0; i < KVM_NR_PAGE_SIZES; ++i) {\n" "\t\tkvfree(slot->arch.rmap[i]);\n" "\t\tslot->arch.rmap[i] = NULL;\n" - "\t\tif (i = 0)\n" + "\t\tif (i == 0)\n" "\t\t\tcontinue;\n" "\n" "\t\tkvfree(slot->arch.lpage_info[i - 1]);\n" @@ -167,7 +163,7 @@ "> > > > \t\t\t\tconst struct kvm_userspace_memory_region *mem,\n" "> > > > \t\t\t\tenum kvm_mr_change change)\n" "> > > > {\n" - "> > > > +\tif (change = KVM_MR_MOVE)\n" + "> > > > +\tif (change == KVM_MR_MOVE)\n" "> > > > +\t\treturn kvm_arch_create_memslot(kvm, memslot,\n" "> > > > +\t\t\t\t\t mem->memory_size >> PAGE_SHIFT);\n" "> > > > +\n" @@ -183,8 +179,8 @@ "> > > new.dirty_bitmap = NULL;\n" "> > > \n" "> > > r = -ENOMEM;\n" - "> > > - if (change = KVM_MR_CREATE) {\n" - "> > > + if (change = KVM_MR_CREATE || change = KVM_MR_MOVE) {\n" + "> > > - if (change == KVM_MR_CREATE) {\n" + "> > > + if (change == KVM_MR_CREATE || change == KVM_MR_MOVE) {\n" "> > > new.userspace_addr = mem->userspace_addr;\n" "> > > \n" "> > > if (kvm_arch_create_memslot(kvm, &new, npages))\n" @@ -213,6 +209,10 @@ "> \n" "> -- \n" "> Peter Xu\n" - > + "> \n" + "_______________________________________________\n" + "kvmarm mailing list\n" + "kvmarm@lists.cs.columbia.edu\n" + https://lists.cs.columbia.edu/mailman/listinfo/kvmarm -88286a6f6c07e57db8e53533a4d34301e0d47f0bc49d18a935c1f7d3c3e3bc2a +b96b1f2c4986f8073894440a341f4fbca6287454a99f99c18860eca8c5304e0c
diff --git a/a/1.txt b/N2/1.txt index 37e4dad..b1daa0c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -114,7 +114,7 @@ out_free: for (i = 0; i < KVM_NR_PAGE_SIZES; ++i) { kvfree(slot->arch.rmap[i]); slot->arch.rmap[i] = NULL; - if (i = 0) + if (i == 0) continue; kvfree(slot->arch.lpage_info[i - 1]); @@ -134,7 +134,7 @@ out_free: > > > > const struct kvm_userspace_memory_region *mem, > > > > enum kvm_mr_change change) > > > > { -> > > > + if (change = KVM_MR_MOVE) +> > > > + if (change == KVM_MR_MOVE) > > > > + return kvm_arch_create_memslot(kvm, memslot, > > > > + mem->memory_size >> PAGE_SHIFT); > > > > + @@ -150,8 +150,8 @@ out_free: > > > new.dirty_bitmap = NULL; > > > > > > r = -ENOMEM; -> > > - if (change = KVM_MR_CREATE) { -> > > + if (change = KVM_MR_CREATE || change = KVM_MR_MOVE) { +> > > - if (change == KVM_MR_CREATE) { +> > > + if (change == KVM_MR_CREATE || change == KVM_MR_MOVE) { > > > new.userspace_addr = mem->userspace_addr; > > > > > > if (kvm_arch_create_memslot(kvm, &new, npages)) diff --git a/a/content_digest b/N2/content_digest index be2da86..6d69781 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,7 +5,7 @@ "ref\020200206020031.GJ387680@xz-x1\0" "From\0Sean Christopherson <sean.j.christopherson@intel.com>\0" "Subject\0Re: [PATCH v5 01/19] KVM: x86: Allocate new rmap and large page tracking when moving memslot\0" - "Date\0Thu, 06 Feb 2020 02:17:15 +0000\0" + "Date\0Wed, 5 Feb 2020 18:17:15 -0800\0" "To\0Peter Xu <peterx@redhat.com>\0" "Cc\0Paolo Bonzini <pbonzini@redhat.com>" Paul Mackerras <paulus@ozlabs.org> @@ -147,7 +147,7 @@ "\tfor (i = 0; i < KVM_NR_PAGE_SIZES; ++i) {\n" "\t\tkvfree(slot->arch.rmap[i]);\n" "\t\tslot->arch.rmap[i] = NULL;\n" - "\t\tif (i = 0)\n" + "\t\tif (i == 0)\n" "\t\t\tcontinue;\n" "\n" "\t\tkvfree(slot->arch.lpage_info[i - 1]);\n" @@ -167,7 +167,7 @@ "> > > > \t\t\t\tconst struct kvm_userspace_memory_region *mem,\n" "> > > > \t\t\t\tenum kvm_mr_change change)\n" "> > > > {\n" - "> > > > +\tif (change = KVM_MR_MOVE)\n" + "> > > > +\tif (change == KVM_MR_MOVE)\n" "> > > > +\t\treturn kvm_arch_create_memslot(kvm, memslot,\n" "> > > > +\t\t\t\t\t mem->memory_size >> PAGE_SHIFT);\n" "> > > > +\n" @@ -183,8 +183,8 @@ "> > > new.dirty_bitmap = NULL;\n" "> > > \n" "> > > r = -ENOMEM;\n" - "> > > - if (change = KVM_MR_CREATE) {\n" - "> > > + if (change = KVM_MR_CREATE || change = KVM_MR_MOVE) {\n" + "> > > - if (change == KVM_MR_CREATE) {\n" + "> > > + if (change == KVM_MR_CREATE || change == KVM_MR_MOVE) {\n" "> > > new.userspace_addr = mem->userspace_addr;\n" "> > > \n" "> > > if (kvm_arch_create_memslot(kvm, &new, npages))\n" @@ -215,4 +215,4 @@ "> Peter Xu\n" > -88286a6f6c07e57db8e53533a4d34301e0d47f0bc49d18a935c1f7d3c3e3bc2a +3b7a4d91b5476b9f364e7593bb61ed33ec1879b8f9eb3a0233990289f08e1120
diff --git a/a/1.txt b/N3/1.txt index 37e4dad..a25b3ec 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -114,7 +114,7 @@ out_free: for (i = 0; i < KVM_NR_PAGE_SIZES; ++i) { kvfree(slot->arch.rmap[i]); slot->arch.rmap[i] = NULL; - if (i = 0) + if (i == 0) continue; kvfree(slot->arch.lpage_info[i - 1]); @@ -134,7 +134,7 @@ out_free: > > > > const struct kvm_userspace_memory_region *mem, > > > > enum kvm_mr_change change) > > > > { -> > > > + if (change = KVM_MR_MOVE) +> > > > + if (change == KVM_MR_MOVE) > > > > + return kvm_arch_create_memslot(kvm, memslot, > > > > + mem->memory_size >> PAGE_SHIFT); > > > > + @@ -150,8 +150,8 @@ out_free: > > > new.dirty_bitmap = NULL; > > > > > > r = -ENOMEM; -> > > - if (change = KVM_MR_CREATE) { -> > > + if (change = KVM_MR_CREATE || change = KVM_MR_MOVE) { +> > > - if (change == KVM_MR_CREATE) { +> > > + if (change == KVM_MR_CREATE || change == KVM_MR_MOVE) { > > > new.userspace_addr = mem->userspace_addr; > > > > > > if (kvm_arch_create_memslot(kvm, &new, npages)) @@ -180,4 +180,9 @@ memory due to overwriting slot->arch.rmap with a new allocation. > > -- > Peter Xu -> +> + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N3/content_digest index be2da86..471ee89 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -5,29 +5,29 @@ "ref\020200206020031.GJ387680@xz-x1\0" "From\0Sean Christopherson <sean.j.christopherson@intel.com>\0" "Subject\0Re: [PATCH v5 01/19] KVM: x86: Allocate new rmap and large page tracking when moving memslot\0" - "Date\0Thu, 06 Feb 2020 02:17:15 +0000\0" + "Date\0Wed, 5 Feb 2020 18:17:15 -0800\0" "To\0Peter Xu <peterx@redhat.com>\0" - "Cc\0Paolo Bonzini <pbonzini@redhat.com>" + "Cc\0Wanpeng Li <wanpengli@tencent.com>" + kvm@vger.kernel.org + David Hildenbrand <david@redhat.com> + linux-mips@vger.kernel.org Paul Mackerras <paulus@ozlabs.org> - Christian Borntraeger <borntraeger@de.ibm.com> + kvmarm@lists.cs.columbia.edu Janosch Frank <frankja@linux.ibm.com> - David Hildenbrand <david@redhat.com> - Cornelia Huck <cohuck@redhat.com> - Vitaly Kuznetsov <vkuznets@redhat.com> - Wanpeng Li <wanpengli@tencent.com> - Jim Mattson <jmattson@google.com> - Joerg Roedel <joro@8bytes.org> Marc Zyngier <maz@kernel.org> - James Morse <james.morse@arm.com> + Joerg Roedel <joro@8bytes.org> + Christian Borntraeger <borntraeger@de.ibm.com> Julien Thierry <julien.thierry.kdev@gmail.com> Suzuki K Poulose <suzuki.poulose@arm.com> - linux-mips@vger.kernel.org - kvm@vger.kernel.org kvm-ppc@vger.kernel.org linux-arm-kernel@lists.infradead.org - kvmarm@lists.cs.columbia.edu - linux-kernel@vger.kernel.org + Jim Mattson <jmattson@google.com> + Cornelia Huck <cohuck@redhat.com> Christoffer Dall <christoffer.dall@arm.com> + linux-kernel@vger.kernel.org + James Morse <james.morse@arm.com> + Paolo Bonzini <pbonzini@redhat.com> + Vitaly Kuznetsov <vkuznets@redhat.com> " Philippe Mathieu-Daud\303\251 <f4bug@amsat.org>\0" "\00:1\0" "b\0" @@ -147,7 +147,7 @@ "\tfor (i = 0; i < KVM_NR_PAGE_SIZES; ++i) {\n" "\t\tkvfree(slot->arch.rmap[i]);\n" "\t\tslot->arch.rmap[i] = NULL;\n" - "\t\tif (i = 0)\n" + "\t\tif (i == 0)\n" "\t\t\tcontinue;\n" "\n" "\t\tkvfree(slot->arch.lpage_info[i - 1]);\n" @@ -167,7 +167,7 @@ "> > > > \t\t\t\tconst struct kvm_userspace_memory_region *mem,\n" "> > > > \t\t\t\tenum kvm_mr_change change)\n" "> > > > {\n" - "> > > > +\tif (change = KVM_MR_MOVE)\n" + "> > > > +\tif (change == KVM_MR_MOVE)\n" "> > > > +\t\treturn kvm_arch_create_memslot(kvm, memslot,\n" "> > > > +\t\t\t\t\t mem->memory_size >> PAGE_SHIFT);\n" "> > > > +\n" @@ -183,8 +183,8 @@ "> > > new.dirty_bitmap = NULL;\n" "> > > \n" "> > > r = -ENOMEM;\n" - "> > > - if (change = KVM_MR_CREATE) {\n" - "> > > + if (change = KVM_MR_CREATE || change = KVM_MR_MOVE) {\n" + "> > > - if (change == KVM_MR_CREATE) {\n" + "> > > + if (change == KVM_MR_CREATE || change == KVM_MR_MOVE) {\n" "> > > new.userspace_addr = mem->userspace_addr;\n" "> > > \n" "> > > if (kvm_arch_create_memslot(kvm, &new, npages))\n" @@ -213,6 +213,11 @@ "> \n" "> -- \n" "> Peter Xu\n" - > + "> \n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -88286a6f6c07e57db8e53533a4d34301e0d47f0bc49d18a935c1f7d3c3e3bc2a +bbb0092c2aa5e49459a6e39f7c40dee097a1912ad5dd1c57fd21c1ddd7fd233a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.