diff for duplicates of <20111206060829.GJ12389@drongo> diff --git a/a/1.txt b/N1/1.txt index 0d5a985..d6bd9ab 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -67,9 +67,9 @@ index fe45a81..ab6772e 100644 + /* only handle 4k, 64k and 16M pages for now */ + if (!(h & HPTE_V_LARGE)) + return 1ul << 12; /* 4k page */ -+ if ((l & 0xf000) = 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206)) ++ if ((l & 0xf000) == 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206)) + return 1ul << 16; /* 64k page */ -+ if ((l & 0xff000) = 0) ++ if ((l & 0xff000) == 0) + return 1ul << 24; /* 16M page */ + return 0; /* error */ +} @@ -254,7 +254,7 @@ index dcd39dc..87016cc 100644 + preempt_disable(); + ret = kvmppc_h_enter(vcpu, flags, pte_index, pteh, ptel); + preempt_enable(); -+ if (ret = H_TOO_HARD) { ++ if (ret == H_TOO_HARD) { + /* this can't happen */ + pr_err("KVM: Oops, kvmppc_h_enter returned too hard!\n"); + ret = H_RESOURCE; /* or something */ @@ -382,20 +382,20 @@ index 6e94af8..5d3590c 100644 } - /* Do we already have an RMA registered? */ -- if (mem->guest_phys_addr = 0 && kvm->arch.rma) +- if (mem->guest_phys_addr == 0 && kvm->arch.rma) - return -EINVAL; + return 0; +} - /* Is this one of our preallocated RMAs? */ -- if (mem->guest_phys_addr = 0) { +- if (mem->guest_phys_addr == 0) { - struct vm_area_struct *vma; - - down_read(¤t->mm->mmap_sem); - vma = find_vma(current->mm, mem->userspace_addr); - if (vma && vma->vm_file && -- vma->vm_file->f_op = &kvm_rma_fops && -- mem->userspace_addr = vma->vm_start) +- vma->vm_file->f_op == &kvm_rma_fops && +- mem->userspace_addr == vma->vm_start) - ri = vma->vm_file->private_data; - up_read(¤t->mm->mmap_sem); - if (!ri && cpu_has_feature(CPU_FTR_ARCH_201)) { @@ -476,8 +476,8 @@ index 6e94af8..5d3590c 100644 + goto up_out; + + /* Is this one of our preallocated RMAs? */ -+ if (vma->vm_file && vma->vm_file->f_op = &kvm_rma_fops && -+ hva = vma->vm_start) ++ if (vma->vm_file && vma->vm_file->f_op == &kvm_rma_fops && ++ hva == vma->vm_start) + ri = vma->vm_file->private_data; + + up_read(¤t->mm->mmap_sem); @@ -591,7 +591,7 @@ index 6e94af8..5d3590c 100644 -void kvmppc_core_commit_memory_region(struct kvm *kvm, - struct kvm_userspace_memory_region *mem) -{ -- if (mem->guest_phys_addr = 0 && mem->memory_size != 0 && +- if (mem->guest_phys_addr == 0 && mem->memory_size != 0 && - !kvm->arch.rma) - kvmppc_map_vrma(kvm, mem); + up_out: @@ -635,16 +635,16 @@ index 659175f..d2eb8ac 100644 struct kvm_memory_slot *memslot; - unsigned long *physp; + unsigned long *physp, pte_size; -+ bool realmode = vcpu->arch.vcore->vcore_state = VCORE_RUNNING; ++ bool realmode = vcpu->arch.vcore->vcore_state == VCORE_RUNNING; - /* only handle 4k, 64k and 16M pages for now */ - porder = 12; - if (pteh & HPTE_V_LARGE) { - if (cpu_has_feature(CPU_FTR_ARCH_206) && -- (ptel & 0xf000) = 0x1000) { +- (ptel & 0xf000) == 0x1000) { - /* 64k page */ - porder = 16; -- } else if ((ptel & 0xff000) = 0) { +- } else if ((ptel & 0xff000) == 0) { - /* 16M page */ - porder = 24; - /* lowest AVA bit must be 0 for 16M pages */ diff --git a/a/content_digest b/N1/content_digest index cccb277..bde2686 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,11 @@ "ref\020111206060156.GD12389@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" - "Subject\0[PATCH 06/13] KVM: PPC: Only get pages when actually needed, not in\0" - "Date\0Tue, 06 Dec 2011 06:08:29 +0000\0" + "Subject\0[PATCH 06/13] KVM: PPC: Only get pages when actually needed, not in prepare_memory_region()\0" + "Date\0Tue, 6 Dec 2011 17:08:29 +1100\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0linuxppc-dev@ozlabs.org" - kvm-ppc@vger.kernel.org - " kvm@vger.kernel.org\0" + kvm@vger.kernel.org + " kvm-ppc@vger.kernel.org\0" "\00:1\0" "b\0" "This removes the code from kvmppc_core_prepare_memory_region() that\n" @@ -77,9 +77,9 @@ "+\t/* only handle 4k, 64k and 16M pages for now */\n" "+\tif (!(h & HPTE_V_LARGE))\n" "+\t\treturn 1ul << 12;\t\t/* 4k page */\n" - "+\tif ((l & 0xf000) = 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206))\n" + "+\tif ((l & 0xf000) == 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206))\n" "+\t\treturn 1ul << 16;\t\t/* 64k page */\n" - "+\tif ((l & 0xff000) = 0)\n" + "+\tif ((l & 0xff000) == 0)\n" "+\t\treturn 1ul << 24;\t\t/* 16M page */\n" "+\treturn 0;\t\t\t\t/* error */\n" "+}\n" @@ -264,7 +264,7 @@ "+\tpreempt_disable();\n" "+\tret = kvmppc_h_enter(vcpu, flags, pte_index, pteh, ptel);\n" "+\tpreempt_enable();\n" - "+\tif (ret = H_TOO_HARD) {\n" + "+\tif (ret == H_TOO_HARD) {\n" "+\t\t/* this can't happen */\n" "+\t\tpr_err(\"KVM: Oops, kvmppc_h_enter returned too hard!\\n\");\n" "+\t\tret = H_RESOURCE;\t/* or something */\n" @@ -392,20 +392,20 @@ " \t}\n" " \n" "-\t/* Do we already have an RMA registered? */\n" - "-\tif (mem->guest_phys_addr = 0 && kvm->arch.rma)\n" + "-\tif (mem->guest_phys_addr == 0 && kvm->arch.rma)\n" "-\t\treturn -EINVAL;\n" "+\treturn 0;\n" "+}\n" " \n" "-\t/* Is this one of our preallocated RMAs? */\n" - "-\tif (mem->guest_phys_addr = 0) {\n" + "-\tif (mem->guest_phys_addr == 0) {\n" "-\t\tstruct vm_area_struct *vma;\n" "-\n" "-\t\tdown_read(¤t->mm->mmap_sem);\n" "-\t\tvma = find_vma(current->mm, mem->userspace_addr);\n" "-\t\tif (vma && vma->vm_file &&\n" - "-\t\t vma->vm_file->f_op = &kvm_rma_fops &&\n" - "-\t\t mem->userspace_addr = vma->vm_start)\n" + "-\t\t vma->vm_file->f_op == &kvm_rma_fops &&\n" + "-\t\t mem->userspace_addr == vma->vm_start)\n" "-\t\t\tri = vma->vm_file->private_data;\n" "-\t\tup_read(¤t->mm->mmap_sem);\n" "-\t\tif (!ri && cpu_has_feature(CPU_FTR_ARCH_201)) {\n" @@ -486,8 +486,8 @@ "+\t\tgoto up_out;\n" "+\n" "+\t/* Is this one of our preallocated RMAs? */\n" - "+\tif (vma->vm_file && vma->vm_file->f_op = &kvm_rma_fops &&\n" - "+\t hva = vma->vm_start)\n" + "+\tif (vma->vm_file && vma->vm_file->f_op == &kvm_rma_fops &&\n" + "+\t hva == vma->vm_start)\n" "+\t\tri = vma->vm_file->private_data;\n" "+\n" "+\tup_read(¤t->mm->mmap_sem);\n" @@ -601,7 +601,7 @@ "-void kvmppc_core_commit_memory_region(struct kvm *kvm,\n" "-\t\t\t\tstruct kvm_userspace_memory_region *mem)\n" "-{\n" - "-\tif (mem->guest_phys_addr = 0 && mem->memory_size != 0 &&\n" + "-\tif (mem->guest_phys_addr == 0 && mem->memory_size != 0 &&\n" "-\t !kvm->arch.rma)\n" "-\t\tkvmppc_map_vrma(kvm, mem);\n" "+ up_out:\n" @@ -645,16 +645,16 @@ " \tstruct kvm_memory_slot *memslot;\n" "-\tunsigned long *physp;\n" "+\tunsigned long *physp, pte_size;\n" - "+\tbool realmode = vcpu->arch.vcore->vcore_state = VCORE_RUNNING;\n" + "+\tbool realmode = vcpu->arch.vcore->vcore_state == VCORE_RUNNING;\n" " \n" "-\t/* only handle 4k, 64k and 16M pages for now */\n" "-\tporder = 12;\n" "-\tif (pteh & HPTE_V_LARGE) {\n" "-\t\tif (cpu_has_feature(CPU_FTR_ARCH_206) &&\n" - "-\t\t (ptel & 0xf000) = 0x1000) {\n" + "-\t\t (ptel & 0xf000) == 0x1000) {\n" "-\t\t\t/* 64k page */\n" "-\t\t\tporder = 16;\n" - "-\t\t} else if ((ptel & 0xff000) = 0) {\n" + "-\t\t} else if ((ptel & 0xff000) == 0) {\n" "-\t\t\t/* 16M page */\n" "-\t\t\tporder = 24;\n" "-\t\t\t/* lowest AVA bit must be 0 for 16M pages */\n" @@ -723,4 +723,4 @@ "-- \n" 1.7.5.4 -b85ed149c31938616b83e31765990b84166ec584c7d30660858de678ed4e07da +c69d15f8d17120d95148258bd2e45c80862aead3a3c245419142a7e6602c7e4c
diff --git a/a/1.txt b/N2/1.txt index 0d5a985..d6bd9ab 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -67,9 +67,9 @@ index fe45a81..ab6772e 100644 + /* only handle 4k, 64k and 16M pages for now */ + if (!(h & HPTE_V_LARGE)) + return 1ul << 12; /* 4k page */ -+ if ((l & 0xf000) = 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206)) ++ if ((l & 0xf000) == 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206)) + return 1ul << 16; /* 64k page */ -+ if ((l & 0xff000) = 0) ++ if ((l & 0xff000) == 0) + return 1ul << 24; /* 16M page */ + return 0; /* error */ +} @@ -254,7 +254,7 @@ index dcd39dc..87016cc 100644 + preempt_disable(); + ret = kvmppc_h_enter(vcpu, flags, pte_index, pteh, ptel); + preempt_enable(); -+ if (ret = H_TOO_HARD) { ++ if (ret == H_TOO_HARD) { + /* this can't happen */ + pr_err("KVM: Oops, kvmppc_h_enter returned too hard!\n"); + ret = H_RESOURCE; /* or something */ @@ -382,20 +382,20 @@ index 6e94af8..5d3590c 100644 } - /* Do we already have an RMA registered? */ -- if (mem->guest_phys_addr = 0 && kvm->arch.rma) +- if (mem->guest_phys_addr == 0 && kvm->arch.rma) - return -EINVAL; + return 0; +} - /* Is this one of our preallocated RMAs? */ -- if (mem->guest_phys_addr = 0) { +- if (mem->guest_phys_addr == 0) { - struct vm_area_struct *vma; - - down_read(¤t->mm->mmap_sem); - vma = find_vma(current->mm, mem->userspace_addr); - if (vma && vma->vm_file && -- vma->vm_file->f_op = &kvm_rma_fops && -- mem->userspace_addr = vma->vm_start) +- vma->vm_file->f_op == &kvm_rma_fops && +- mem->userspace_addr == vma->vm_start) - ri = vma->vm_file->private_data; - up_read(¤t->mm->mmap_sem); - if (!ri && cpu_has_feature(CPU_FTR_ARCH_201)) { @@ -476,8 +476,8 @@ index 6e94af8..5d3590c 100644 + goto up_out; + + /* Is this one of our preallocated RMAs? */ -+ if (vma->vm_file && vma->vm_file->f_op = &kvm_rma_fops && -+ hva = vma->vm_start) ++ if (vma->vm_file && vma->vm_file->f_op == &kvm_rma_fops && ++ hva == vma->vm_start) + ri = vma->vm_file->private_data; + + up_read(¤t->mm->mmap_sem); @@ -591,7 +591,7 @@ index 6e94af8..5d3590c 100644 -void kvmppc_core_commit_memory_region(struct kvm *kvm, - struct kvm_userspace_memory_region *mem) -{ -- if (mem->guest_phys_addr = 0 && mem->memory_size != 0 && +- if (mem->guest_phys_addr == 0 && mem->memory_size != 0 && - !kvm->arch.rma) - kvmppc_map_vrma(kvm, mem); + up_out: @@ -635,16 +635,16 @@ index 659175f..d2eb8ac 100644 struct kvm_memory_slot *memslot; - unsigned long *physp; + unsigned long *physp, pte_size; -+ bool realmode = vcpu->arch.vcore->vcore_state = VCORE_RUNNING; ++ bool realmode = vcpu->arch.vcore->vcore_state == VCORE_RUNNING; - /* only handle 4k, 64k and 16M pages for now */ - porder = 12; - if (pteh & HPTE_V_LARGE) { - if (cpu_has_feature(CPU_FTR_ARCH_206) && -- (ptel & 0xf000) = 0x1000) { +- (ptel & 0xf000) == 0x1000) { - /* 64k page */ - porder = 16; -- } else if ((ptel & 0xff000) = 0) { +- } else if ((ptel & 0xff000) == 0) { - /* 16M page */ - porder = 24; - /* lowest AVA bit must be 0 for 16M pages */ diff --git a/a/content_digest b/N2/content_digest index cccb277..84dc6c3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020111206060156.GD12389@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" - "Subject\0[PATCH 06/13] KVM: PPC: Only get pages when actually needed, not in\0" - "Date\0Tue, 06 Dec 2011 06:08:29 +0000\0" + "Subject\0[PATCH 06/13] KVM: PPC: Only get pages when actually needed, not in prepare_memory_region()\0" + "Date\0Tue, 6 Dec 2011 17:08:29 +1100\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0linuxppc-dev@ozlabs.org" kvm-ppc@vger.kernel.org @@ -77,9 +77,9 @@ "+\t/* only handle 4k, 64k and 16M pages for now */\n" "+\tif (!(h & HPTE_V_LARGE))\n" "+\t\treturn 1ul << 12;\t\t/* 4k page */\n" - "+\tif ((l & 0xf000) = 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206))\n" + "+\tif ((l & 0xf000) == 0x1000 && cpu_has_feature(CPU_FTR_ARCH_206))\n" "+\t\treturn 1ul << 16;\t\t/* 64k page */\n" - "+\tif ((l & 0xff000) = 0)\n" + "+\tif ((l & 0xff000) == 0)\n" "+\t\treturn 1ul << 24;\t\t/* 16M page */\n" "+\treturn 0;\t\t\t\t/* error */\n" "+}\n" @@ -264,7 +264,7 @@ "+\tpreempt_disable();\n" "+\tret = kvmppc_h_enter(vcpu, flags, pte_index, pteh, ptel);\n" "+\tpreempt_enable();\n" - "+\tif (ret = H_TOO_HARD) {\n" + "+\tif (ret == H_TOO_HARD) {\n" "+\t\t/* this can't happen */\n" "+\t\tpr_err(\"KVM: Oops, kvmppc_h_enter returned too hard!\\n\");\n" "+\t\tret = H_RESOURCE;\t/* or something */\n" @@ -392,20 +392,20 @@ " \t}\n" " \n" "-\t/* Do we already have an RMA registered? */\n" - "-\tif (mem->guest_phys_addr = 0 && kvm->arch.rma)\n" + "-\tif (mem->guest_phys_addr == 0 && kvm->arch.rma)\n" "-\t\treturn -EINVAL;\n" "+\treturn 0;\n" "+}\n" " \n" "-\t/* Is this one of our preallocated RMAs? */\n" - "-\tif (mem->guest_phys_addr = 0) {\n" + "-\tif (mem->guest_phys_addr == 0) {\n" "-\t\tstruct vm_area_struct *vma;\n" "-\n" "-\t\tdown_read(¤t->mm->mmap_sem);\n" "-\t\tvma = find_vma(current->mm, mem->userspace_addr);\n" "-\t\tif (vma && vma->vm_file &&\n" - "-\t\t vma->vm_file->f_op = &kvm_rma_fops &&\n" - "-\t\t mem->userspace_addr = vma->vm_start)\n" + "-\t\t vma->vm_file->f_op == &kvm_rma_fops &&\n" + "-\t\t mem->userspace_addr == vma->vm_start)\n" "-\t\t\tri = vma->vm_file->private_data;\n" "-\t\tup_read(¤t->mm->mmap_sem);\n" "-\t\tif (!ri && cpu_has_feature(CPU_FTR_ARCH_201)) {\n" @@ -486,8 +486,8 @@ "+\t\tgoto up_out;\n" "+\n" "+\t/* Is this one of our preallocated RMAs? */\n" - "+\tif (vma->vm_file && vma->vm_file->f_op = &kvm_rma_fops &&\n" - "+\t hva = vma->vm_start)\n" + "+\tif (vma->vm_file && vma->vm_file->f_op == &kvm_rma_fops &&\n" + "+\t hva == vma->vm_start)\n" "+\t\tri = vma->vm_file->private_data;\n" "+\n" "+\tup_read(¤t->mm->mmap_sem);\n" @@ -601,7 +601,7 @@ "-void kvmppc_core_commit_memory_region(struct kvm *kvm,\n" "-\t\t\t\tstruct kvm_userspace_memory_region *mem)\n" "-{\n" - "-\tif (mem->guest_phys_addr = 0 && mem->memory_size != 0 &&\n" + "-\tif (mem->guest_phys_addr == 0 && mem->memory_size != 0 &&\n" "-\t !kvm->arch.rma)\n" "-\t\tkvmppc_map_vrma(kvm, mem);\n" "+ up_out:\n" @@ -645,16 +645,16 @@ " \tstruct kvm_memory_slot *memslot;\n" "-\tunsigned long *physp;\n" "+\tunsigned long *physp, pte_size;\n" - "+\tbool realmode = vcpu->arch.vcore->vcore_state = VCORE_RUNNING;\n" + "+\tbool realmode = vcpu->arch.vcore->vcore_state == VCORE_RUNNING;\n" " \n" "-\t/* only handle 4k, 64k and 16M pages for now */\n" "-\tporder = 12;\n" "-\tif (pteh & HPTE_V_LARGE) {\n" "-\t\tif (cpu_has_feature(CPU_FTR_ARCH_206) &&\n" - "-\t\t (ptel & 0xf000) = 0x1000) {\n" + "-\t\t (ptel & 0xf000) == 0x1000) {\n" "-\t\t\t/* 64k page */\n" "-\t\t\tporder = 16;\n" - "-\t\t} else if ((ptel & 0xff000) = 0) {\n" + "-\t\t} else if ((ptel & 0xff000) == 0) {\n" "-\t\t\t/* 16M page */\n" "-\t\t\tporder = 24;\n" "-\t\t\t/* lowest AVA bit must be 0 for 16M pages */\n" @@ -723,4 +723,4 @@ "-- \n" 1.7.5.4 -b85ed149c31938616b83e31765990b84166ec584c7d30660858de678ed4e07da +3c4ebcfb4b5769feb9a71e83bef4edb774a9af65d4feb3c7e887b35e2c6267c2
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.