diff for duplicates of <20181030050300.GA11072@blackberry> diff --git a/a/1.txt b/N1/1.txt index 6cc5bec..17e7731 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -181,7 +181,7 @@ are dummy implementations for now. > #include "book3s.h" > > @@ -935,6 +936,20 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) -> if (ret = H_TOO_HARD) +> if (ret == H_TOO_HARD) > return RESUME_HOST; > break; > + case H_SVM_PAGE_IN: @@ -411,7 +411,7 @@ space. But maybe that could be a future optimization. > + > + list = &hmm_hash[kvmppc_hmm_pfn_hash_fn(gpa)]; > + hlist_for_each_entry(p, list, hlist) { -> + if (p->addr = gpa) { +> + if (p->addr == gpa) { > + hlist_del(&p->hlist); > + kfree(p); > + return; @@ -441,7 +441,7 @@ space. But maybe that could be a future optimization. > + spin_lock_irqsave(&kvmppc_hmm_lock, flags); > + list = &hmm_hash[kvmppc_hmm_pfn_hash_fn(gpa)]; > + hlist_for_each_entry(p, list, hlist) { -> + if (p->addr = gpa) { +> + if (p->addr == gpa) { > + found = true; > + break; > + } @@ -689,7 +689,7 @@ when looking up memslots. > + pfn = page_to_pfn(dpage); > + ret = uv_page_out(pvt->lpid, pfn << PAGE_SHIFT, > + pvt->gpa, 0, PAGE_SHIFT); -> + if (ret = U_SUCCESS) +> + if (ret == U_SUCCESS) > + *dst_pfn = migrate_pfn(pfn) | MIGRATE_PFN_LOCKED; > +} > + @@ -726,7 +726,7 @@ when looking up memslots. > + if (migrate_vma(&kvmppc_hmm_fault_migrate_ops, vma, addr, end, > + &src_pfn, &dst_pfn, NULL)) > + return VM_FAULT_SIGBUS; -> + if (dst_pfn = MIGRATE_PFN_ERROR) +> + if (dst_pfn == MIGRATE_PFN_ERROR) > + return VM_FAULT_SIGBUS; > + return 0; > +} diff --git a/a/content_digest b/N1/content_digest index 922910d..5e217a4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,16 +2,16 @@ "ref\020181022051837.1165-2-bharata@linux.ibm.com\0" "From\0Paul Mackerras <paulus@ozlabs.org>\0" "Subject\0Re: [RFC PATCH v1 1/4] kvmppc: HMM backend driver to manage pages of secure guest\0" - "Date\0Tue, 30 Oct 2018 05:03:00 +0000\0" + "Date\0Tue, 30 Oct 2018 16:03:00 +1100\0" "To\0Bharata B Rao <bharata@linux.ibm.com>\0" - "Cc\0linuxppc-dev@lists.ozlabs.org" + "Cc\0linuxram@us.ibm.com" kvm-ppc@vger.kernel.org - linux-mm@kvack.org - paulus@au1.ibm.com benh@linux.ibm.com - aneesh.kumar@linux.vnet.ibm.com + linux-mm@kvack.org jglisse@redhat.com - " linuxram@us.ibm.com\0" + aneesh.kumar@linux.vnet.ibm.com + paulus@au1.ibm.com + " linuxppc-dev@lists.ozlabs.org\0" "\00:1\0" "b\0" "On Mon, Oct 22, 2018 at 10:48:34AM +0530, Bharata B Rao wrote:\n" @@ -197,7 +197,7 @@ "> #include \"book3s.h\"\n" "> \n" "> @@ -935,6 +936,20 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)\n" - "> \t\tif (ret = H_TOO_HARD)\n" + "> \t\tif (ret == H_TOO_HARD)\n" "> \t\t\treturn RESUME_HOST;\n" "> \t\tbreak;\n" "> +\tcase H_SVM_PAGE_IN:\n" @@ -427,7 +427,7 @@ "> +\n" "> +\tlist = &hmm_hash[kvmppc_hmm_pfn_hash_fn(gpa)];\n" "> +\thlist_for_each_entry(p, list, hlist) {\n" - "> +\t\tif (p->addr = gpa) {\n" + "> +\t\tif (p->addr == gpa) {\n" "> +\t\t\thlist_del(&p->hlist);\n" "> +\t\t\tkfree(p);\n" "> +\t\t\treturn;\n" @@ -457,7 +457,7 @@ "> +\tspin_lock_irqsave(&kvmppc_hmm_lock, flags);\n" "> +\tlist = &hmm_hash[kvmppc_hmm_pfn_hash_fn(gpa)];\n" "> +\thlist_for_each_entry(p, list, hlist) {\n" - "> +\t\tif (p->addr = gpa) {\n" + "> +\t\tif (p->addr == gpa) {\n" "> +\t\t\tfound = true;\n" "> +\t\t\tbreak;\n" "> +\t\t}\n" @@ -705,7 +705,7 @@ "> +\tpfn = page_to_pfn(dpage);\n" "> +\tret = uv_page_out(pvt->lpid, pfn << PAGE_SHIFT,\n" "> +\t\t\t pvt->gpa, 0, PAGE_SHIFT);\n" - "> +\tif (ret = U_SUCCESS)\n" + "> +\tif (ret == U_SUCCESS)\n" "> +\t\t*dst_pfn = migrate_pfn(pfn) | MIGRATE_PFN_LOCKED;\n" "> +}\n" "> +\n" @@ -742,7 +742,7 @@ "> +\tif (migrate_vma(&kvmppc_hmm_fault_migrate_ops, vma, addr, end,\n" "> +\t\t\t&src_pfn, &dst_pfn, NULL))\n" "> +\t\treturn VM_FAULT_SIGBUS;\n" - "> +\tif (dst_pfn = MIGRATE_PFN_ERROR)\n" + "> +\tif (dst_pfn == MIGRATE_PFN_ERROR)\n" "> +\t\treturn VM_FAULT_SIGBUS;\n" "> +\treturn 0;\n" "> +}\n" @@ -876,4 +876,4 @@ "\n" Paul. -c817b26182bea9b26e8ce79c35e832f5881086b07e33e65748e6e73745904ac2 +6ffe33e49de5f468f85bb2ffa74d1e5bc6d69b4969ebd2bff2764af45df60c30
diff --git a/a/1.txt b/N2/1.txt index 6cc5bec..19ee260 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -181,7 +181,7 @@ are dummy implementations for now. > #include "book3s.h" > > @@ -935,6 +936,20 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) -> if (ret = H_TOO_HARD) +> if (ret == H_TOO_HARD) > return RESUME_HOST; > break; > + case H_SVM_PAGE_IN: @@ -297,7 +297,7 @@ Ditto. > + * HMM driver to manage page migration between normal and secure > + * memory. > + * -> + * Based on Jérôme Glisse's HMM dummy driver. +> + * Based on Jerome Glisse's HMM dummy driver. > + * > + * Copyright 2018 Bharata B Rao, IBM Corp. <bharata@linux.ibm.com> > + */ @@ -411,7 +411,7 @@ space. But maybe that could be a future optimization. > + > + list = &hmm_hash[kvmppc_hmm_pfn_hash_fn(gpa)]; > + hlist_for_each_entry(p, list, hlist) { -> + if (p->addr = gpa) { +> + if (p->addr == gpa) { > + hlist_del(&p->hlist); > + kfree(p); > + return; @@ -441,7 +441,7 @@ space. But maybe that could be a future optimization. > + spin_lock_irqsave(&kvmppc_hmm_lock, flags); > + list = &hmm_hash[kvmppc_hmm_pfn_hash_fn(gpa)]; > + hlist_for_each_entry(p, list, hlist) { -> + if (p->addr = gpa) { +> + if (p->addr == gpa) { > + found = true; > + break; > + } @@ -689,7 +689,7 @@ when looking up memslots. > + pfn = page_to_pfn(dpage); > + ret = uv_page_out(pvt->lpid, pfn << PAGE_SHIFT, > + pvt->gpa, 0, PAGE_SHIFT); -> + if (ret = U_SUCCESS) +> + if (ret == U_SUCCESS) > + *dst_pfn = migrate_pfn(pfn) | MIGRATE_PFN_LOCKED; > +} > + @@ -726,7 +726,7 @@ when looking up memslots. > + if (migrate_vma(&kvmppc_hmm_fault_migrate_ops, vma, addr, end, > + &src_pfn, &dst_pfn, NULL)) > + return VM_FAULT_SIGBUS; -> + if (dst_pfn = MIGRATE_PFN_ERROR) +> + if (dst_pfn == MIGRATE_PFN_ERROR) > + return VM_FAULT_SIGBUS; > + return 0; > +} diff --git a/a/content_digest b/N2/content_digest index 922910d..97ad4ab 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\020181022051837.1165-2-bharata@linux.ibm.com\0" "From\0Paul Mackerras <paulus@ozlabs.org>\0" "Subject\0Re: [RFC PATCH v1 1/4] kvmppc: HMM backend driver to manage pages of secure guest\0" - "Date\0Tue, 30 Oct 2018 05:03:00 +0000\0" + "Date\0Tue, 30 Oct 2018 16:03:00 +1100\0" "To\0Bharata B Rao <bharata@linux.ibm.com>\0" "Cc\0linuxppc-dev@lists.ozlabs.org" kvm-ppc@vger.kernel.org @@ -197,7 +197,7 @@ "> #include \"book3s.h\"\n" "> \n" "> @@ -935,6 +936,20 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)\n" - "> \t\tif (ret = H_TOO_HARD)\n" + "> \t\tif (ret == H_TOO_HARD)\n" "> \t\t\treturn RESUME_HOST;\n" "> \t\tbreak;\n" "> +\tcase H_SVM_PAGE_IN:\n" @@ -313,7 +313,7 @@ "> + * HMM driver to manage page migration between normal and secure\n" "> + * memory.\n" "> + *\n" - "> + * Based on J\303\251r\303\264me Glisse's HMM dummy driver.\n" + "> + * Based on Jerome Glisse's HMM dummy driver.\n" "> + *\n" "> + * Copyright 2018 Bharata B Rao, IBM Corp. <bharata@linux.ibm.com>\n" "> + */\n" @@ -427,7 +427,7 @@ "> +\n" "> +\tlist = &hmm_hash[kvmppc_hmm_pfn_hash_fn(gpa)];\n" "> +\thlist_for_each_entry(p, list, hlist) {\n" - "> +\t\tif (p->addr = gpa) {\n" + "> +\t\tif (p->addr == gpa) {\n" "> +\t\t\thlist_del(&p->hlist);\n" "> +\t\t\tkfree(p);\n" "> +\t\t\treturn;\n" @@ -457,7 +457,7 @@ "> +\tspin_lock_irqsave(&kvmppc_hmm_lock, flags);\n" "> +\tlist = &hmm_hash[kvmppc_hmm_pfn_hash_fn(gpa)];\n" "> +\thlist_for_each_entry(p, list, hlist) {\n" - "> +\t\tif (p->addr = gpa) {\n" + "> +\t\tif (p->addr == gpa) {\n" "> +\t\t\tfound = true;\n" "> +\t\t\tbreak;\n" "> +\t\t}\n" @@ -705,7 +705,7 @@ "> +\tpfn = page_to_pfn(dpage);\n" "> +\tret = uv_page_out(pvt->lpid, pfn << PAGE_SHIFT,\n" "> +\t\t\t pvt->gpa, 0, PAGE_SHIFT);\n" - "> +\tif (ret = U_SUCCESS)\n" + "> +\tif (ret == U_SUCCESS)\n" "> +\t\t*dst_pfn = migrate_pfn(pfn) | MIGRATE_PFN_LOCKED;\n" "> +}\n" "> +\n" @@ -742,7 +742,7 @@ "> +\tif (migrate_vma(&kvmppc_hmm_fault_migrate_ops, vma, addr, end,\n" "> +\t\t\t&src_pfn, &dst_pfn, NULL))\n" "> +\t\treturn VM_FAULT_SIGBUS;\n" - "> +\tif (dst_pfn = MIGRATE_PFN_ERROR)\n" + "> +\tif (dst_pfn == MIGRATE_PFN_ERROR)\n" "> +\t\treturn VM_FAULT_SIGBUS;\n" "> +\treturn 0;\n" "> +}\n" @@ -876,4 +876,4 @@ "\n" Paul. -c817b26182bea9b26e8ce79c35e832f5881086b07e33e65748e6e73745904ac2 +a63e2c10ef5feb56cfe6c2b5133c77e4bbd16d2daa0b5b3d023d13ad380108ea
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.