diff for duplicates of <20181112095949.GE17399@in.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 15ddb21..fcb9ac0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -165,7 +165,7 @@ On Thu, Nov 01, 2018 at 05:43:39PM +1100, Balbir Singh wrote: > > #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: @@ -378,7 +378,7 @@ shares migrate_vma() callbacks with fault handler callbacks. > > + > > + 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; @@ -408,7 +408,7 @@ shares migrate_vma() callbacks with fault handler callbacks. > > + 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; > > + } @@ -623,7 +623,7 @@ No yet. > > + if (!addr) > > + return H_PARAMETER; > -> So addr = 0 is invalid? +> So addr == 0 is invalid? Switched to gfn_to_hva() and kvm_is_error_hva() which should cover all the valid cases. @@ -691,7 +691,7 @@ Yes, uv_page_out() needs physical address as argument. > > > + pvt->gpa, 0, PAGE_SHIFT); -> > + if (ret = U_SUCCESS) +> > + if (ret == U_SUCCESS) > > + *dst_pfn = migrate_pfn(pfn) | MIGRATE_PFN_LOCKED; > > +} > > + @@ -728,7 +728,7 @@ Yes, uv_page_out() needs physical address as argument. > > + 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 c1196a9..9fe827a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,16 +3,16 @@ "ref\020181101064339.GD16399@350D\0" "From\0Bharata B Rao <bharata@linux.ibm.com>\0" "Subject\0Re: [RFC PATCH v1 1/4] kvmppc: HMM backend driver to manage pages of secure guest\0" - "Date\0Mon, 12 Nov 2018 10:11:49 +0000\0" + "Date\0Mon, 12 Nov 2018 15:29:49 +0530\0" "To\0Balbir Singh <bsingharora@gmail.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 Thu, Nov 01, 2018 at 05:43:39PM +1100, Balbir Singh wrote:\n" @@ -182,7 +182,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" @@ -395,7 +395,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" @@ -425,7 +425,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" @@ -640,7 +640,7 @@ "> > +\tif (!addr)\n" "> > +\t\treturn H_PARAMETER;\n" "> \n" - "> So addr = 0 is invalid?\n" + "> So addr == 0 is invalid?\n" "\n" "Switched to gfn_to_hva() and kvm_is_error_hva() which should cover all\n" "the valid cases.\n" @@ -708,7 +708,7 @@ "\n" "> \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" @@ -745,7 +745,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" @@ -854,4 +854,4 @@ "Regards,\n" Bharata. -fa578b0a6b5f8a6b96901f5340e41ae7052cab78fae21c00689676ff48861428 +b112f41ddb73687c86614c715cafd502f84a0167a100ec9c4796dd88aebb7d8d
diff --git a/a/1.txt b/N2/1.txt index 15ddb21..5665220 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -165,7 +165,7 @@ On Thu, Nov 01, 2018 at 05:43:39PM +1100, Balbir Singh wrote: > > #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: @@ -270,7 +270,7 @@ shares migrate_vma() callbacks with fault handler callbacks. > > + * 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> > > + */ @@ -378,7 +378,7 @@ shares migrate_vma() callbacks with fault handler callbacks. > > + > > + 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; @@ -408,7 +408,7 @@ shares migrate_vma() callbacks with fault handler callbacks. > > + 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; > > + } @@ -623,7 +623,7 @@ No yet. > > + if (!addr) > > + return H_PARAMETER; > -> So addr = 0 is invalid? +> So addr == 0 is invalid? Switched to gfn_to_hva() and kvm_is_error_hva() which should cover all the valid cases. @@ -691,7 +691,7 @@ Yes, uv_page_out() needs physical address as argument. > > > + pvt->gpa, 0, PAGE_SHIFT); -> > + if (ret = U_SUCCESS) +> > + if (ret == U_SUCCESS) > > + *dst_pfn = migrate_pfn(pfn) | MIGRATE_PFN_LOCKED; > > +} > > + @@ -728,7 +728,7 @@ Yes, uv_page_out() needs physical address as argument. > > + 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 c1196a9..71e1b8e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "ref\020181101064339.GD16399@350D\0" "From\0Bharata B Rao <bharata@linux.ibm.com>\0" "Subject\0Re: [RFC PATCH v1 1/4] kvmppc: HMM backend driver to manage pages of secure guest\0" - "Date\0Mon, 12 Nov 2018 10:11:49 +0000\0" + "Date\0Mon, 12 Nov 2018 15:29:49 +0530\0" "To\0Balbir Singh <bsingharora@gmail.com>\0" "Cc\0linuxppc-dev@lists.ozlabs.org" kvm-ppc@vger.kernel.org @@ -182,7 +182,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" @@ -287,7 +287,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" @@ -395,7 +395,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" @@ -425,7 +425,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" @@ -640,7 +640,7 @@ "> > +\tif (!addr)\n" "> > +\t\treturn H_PARAMETER;\n" "> \n" - "> So addr = 0 is invalid?\n" + "> So addr == 0 is invalid?\n" "\n" "Switched to gfn_to_hva() and kvm_is_error_hva() which should cover all\n" "the valid cases.\n" @@ -708,7 +708,7 @@ "\n" "> \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" @@ -745,7 +745,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" @@ -854,4 +854,4 @@ "Regards,\n" Bharata. -fa578b0a6b5f8a6b96901f5340e41ae7052cab78fae21c00689676ff48861428 +b106d8fc1814684d7b86540188ed79053b1d3b913e31d2df7053fdb601e2012b
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.