diff for duplicates of <87387fclmg.fsf@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 59d0958..c3320a5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ Any update on this patch. We could drop patch 3. Any feedback on 1 and 2 > --- a/arch/powerpc/include/asm/kvm_book3s_64.h > +++ b/arch/powerpc/include/asm/kvm_book3s_64.h > @@ -86,6 +86,20 @@ static inline long try_lock_hpte(__be64 *hpte, unsigned long bits) -> return old = 0; +> return old == 0; > } > > +static inline void unlock_hpte(__be64 *hpte, unsigned long hpte_v) @@ -136,7 +136,7 @@ Any update on this patch. We could drop patch 3. Any feedback on 1 and 2 > - hptp[0] &= ~cpu_to_be64(HPTE_V_HVLOCK); > + unlock_hpte(hptp, be64_to_cpu(hptp[0])); > preempt_enable(); -> if (!(valid = want_valid && (first_pass || dirty))) +> if (!(valid == want_valid && (first_pass || dirty))) > ok = 0; > diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c > index 084ad54c73cd..769a5d4c0430 100644 @@ -167,7 +167,7 @@ Any update on this patch. We could drop patch 3. Any feedback on 1 and 2 > + __unlock_hpte(hpte, pte); > hpte += 2; > } -> if (i = 8) +> if (i == 8) > @@ -314,9 +308,9 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags, > > while (!try_lock_hpte(hpte, HPTE_V_HVLOCK)) @@ -190,7 +190,7 @@ Any update on this patch. We could drop patch 3. Any feedback on 1 and 2 > > *pte_idx_ret = pte_index; > @@ -487,7 +481,7 @@ long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags, -> if ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) = 0 || +> if ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 || > ((flags & H_AVPN) && (pte & ~0x7fUL) != avpn) || > ((flags & H_ANDCOND) && (pte & avpn) != 0)) { > - hpte[0] &= ~cpu_to_be64(HPTE_V_HVLOCK); @@ -209,7 +209,7 @@ Any update on this patch. We could drop patch 3. Any feedback on 1 and 2 > > @@ -649,7 +643,7 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags, > pte = be64_to_cpu(hpte[0]); -> if ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) = 0 || +> if ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 || > ((flags & H_AVPN) && (pte & ~0x7fUL) != avpn)) { > - hpte[0] &= ~cpu_to_be64(HPTE_V_HVLOCK); > + __unlock_hpte(hpte, pte); diff --git a/a/content_digest b/N1/content_digest index fee6e28..a244098 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,13 @@ "ref\01413815340-22426-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH 1/3] KVM: PPC: BOOK3S: HV: Add helpers for lock/unlock hpte\0" - "Date\0Tue, 13 Jan 2015 05:21:27 +0000\0" + "Date\0Tue, 13 Jan 2015 10:39:27 +0530\0" "To\0agraf@suse.de" benh@kernel.crashing.org " paulus@samba.org\0" "Cc\0linuxppc-dev@lists.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" "\n" @@ -37,7 +37,7 @@ "> --- a/arch/powerpc/include/asm/kvm_book3s_64.h\n" "> +++ b/arch/powerpc/include/asm/kvm_book3s_64.h\n" "> @@ -86,6 +86,20 @@ static inline long try_lock_hpte(__be64 *hpte, unsigned long bits)\n" - "> \treturn old = 0;\n" + "> \treturn old == 0;\n" "> }\n" "> \n" "> +static inline void unlock_hpte(__be64 *hpte, unsigned long hpte_v)\n" @@ -148,7 +148,7 @@ "> -\t\thptp[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);\n" "> +\t\tunlock_hpte(hptp, be64_to_cpu(hptp[0]));\n" "> \t\tpreempt_enable();\n" - "> \t\tif (!(valid = want_valid && (first_pass || dirty)))\n" + "> \t\tif (!(valid == want_valid && (first_pass || dirty)))\n" "> \t\t\tok = 0;\n" "> diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c\n" "> index 084ad54c73cd..769a5d4c0430 100644\n" @@ -179,7 +179,7 @@ "> +\t\t\t\t__unlock_hpte(hpte, pte);\n" "> \t\t\t\thpte += 2;\n" "> \t\t\t}\n" - "> \t\t\tif (i = 8)\n" + "> \t\t\tif (i == 8)\n" "> @@ -314,9 +308,9 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,\n" "> \n" "> \t\t\twhile (!try_lock_hpte(hpte, HPTE_V_HVLOCK))\n" @@ -202,7 +202,7 @@ "> \n" "> \t*pte_idx_ret = pte_index;\n" "> @@ -487,7 +481,7 @@ long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags,\n" - "> \tif ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) = 0 ||\n" + "> \tif ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 ||\n" "> \t ((flags & H_AVPN) && (pte & ~0x7fUL) != avpn) ||\n" "> \t ((flags & H_ANDCOND) && (pte & avpn) != 0)) {\n" "> -\t\thpte[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);\n" @@ -221,7 +221,7 @@ "> \n" "> @@ -649,7 +643,7 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,\n" "> \tpte = be64_to_cpu(hpte[0]);\n" - "> \tif ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) = 0 ||\n" + "> \tif ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 ||\n" "> \t ((flags & H_AVPN) && (pte & ~0x7fUL) != avpn)) {\n" "> -\t\thpte[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);\n" "> +\t\t__unlock_hpte(hpte, pte);\n" @@ -255,4 +255,4 @@ "> the body of a message to majordomo@vger.kernel.org\n" > More majordomo info at http://vger.kernel.org/majordomo-info.html -4499a8e83da22d74ea60e012887c5128561790fa2f2f8e21c78911e603c27779 +f6bfae3b98144b5f574c69e83ba0fd46b8a19c07fcc127e4bb3981827f4acd14
diff --git a/a/1.txt b/N2/1.txt index 59d0958..c3320a5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -25,7 +25,7 @@ Any update on this patch. We could drop patch 3. Any feedback on 1 and 2 > --- a/arch/powerpc/include/asm/kvm_book3s_64.h > +++ b/arch/powerpc/include/asm/kvm_book3s_64.h > @@ -86,6 +86,20 @@ static inline long try_lock_hpte(__be64 *hpte, unsigned long bits) -> return old = 0; +> return old == 0; > } > > +static inline void unlock_hpte(__be64 *hpte, unsigned long hpte_v) @@ -136,7 +136,7 @@ Any update on this patch. We could drop patch 3. Any feedback on 1 and 2 > - hptp[0] &= ~cpu_to_be64(HPTE_V_HVLOCK); > + unlock_hpte(hptp, be64_to_cpu(hptp[0])); > preempt_enable(); -> if (!(valid = want_valid && (first_pass || dirty))) +> if (!(valid == want_valid && (first_pass || dirty))) > ok = 0; > diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c > index 084ad54c73cd..769a5d4c0430 100644 @@ -167,7 +167,7 @@ Any update on this patch. We could drop patch 3. Any feedback on 1 and 2 > + __unlock_hpte(hpte, pte); > hpte += 2; > } -> if (i = 8) +> if (i == 8) > @@ -314,9 +308,9 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags, > > while (!try_lock_hpte(hpte, HPTE_V_HVLOCK)) @@ -190,7 +190,7 @@ Any update on this patch. We could drop patch 3. Any feedback on 1 and 2 > > *pte_idx_ret = pte_index; > @@ -487,7 +481,7 @@ long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags, -> if ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) = 0 || +> if ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 || > ((flags & H_AVPN) && (pte & ~0x7fUL) != avpn) || > ((flags & H_ANDCOND) && (pte & avpn) != 0)) { > - hpte[0] &= ~cpu_to_be64(HPTE_V_HVLOCK); @@ -209,7 +209,7 @@ Any update on this patch. We could drop patch 3. Any feedback on 1 and 2 > > @@ -649,7 +643,7 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags, > pte = be64_to_cpu(hpte[0]); -> if ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) = 0 || +> if ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 || > ((flags & H_AVPN) && (pte & ~0x7fUL) != avpn)) { > - hpte[0] &= ~cpu_to_be64(HPTE_V_HVLOCK); > + __unlock_hpte(hpte, pte); diff --git a/a/content_digest b/N2/content_digest index fee6e28..2fe6fae 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01413815340-22426-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH 1/3] KVM: PPC: BOOK3S: HV: Add helpers for lock/unlock hpte\0" - "Date\0Tue, 13 Jan 2015 05:21:27 +0000\0" + "Date\0Tue, 13 Jan 2015 10:39:27 +0530\0" "To\0agraf@suse.de" benh@kernel.crashing.org " paulus@samba.org\0" @@ -37,7 +37,7 @@ "> --- a/arch/powerpc/include/asm/kvm_book3s_64.h\n" "> +++ b/arch/powerpc/include/asm/kvm_book3s_64.h\n" "> @@ -86,6 +86,20 @@ static inline long try_lock_hpte(__be64 *hpte, unsigned long bits)\n" - "> \treturn old = 0;\n" + "> \treturn old == 0;\n" "> }\n" "> \n" "> +static inline void unlock_hpte(__be64 *hpte, unsigned long hpte_v)\n" @@ -148,7 +148,7 @@ "> -\t\thptp[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);\n" "> +\t\tunlock_hpte(hptp, be64_to_cpu(hptp[0]));\n" "> \t\tpreempt_enable();\n" - "> \t\tif (!(valid = want_valid && (first_pass || dirty)))\n" + "> \t\tif (!(valid == want_valid && (first_pass || dirty)))\n" "> \t\t\tok = 0;\n" "> diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c\n" "> index 084ad54c73cd..769a5d4c0430 100644\n" @@ -179,7 +179,7 @@ "> +\t\t\t\t__unlock_hpte(hpte, pte);\n" "> \t\t\t\thpte += 2;\n" "> \t\t\t}\n" - "> \t\t\tif (i = 8)\n" + "> \t\t\tif (i == 8)\n" "> @@ -314,9 +308,9 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,\n" "> \n" "> \t\t\twhile (!try_lock_hpte(hpte, HPTE_V_HVLOCK))\n" @@ -202,7 +202,7 @@ "> \n" "> \t*pte_idx_ret = pte_index;\n" "> @@ -487,7 +481,7 @@ long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags,\n" - "> \tif ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) = 0 ||\n" + "> \tif ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 ||\n" "> \t ((flags & H_AVPN) && (pte & ~0x7fUL) != avpn) ||\n" "> \t ((flags & H_ANDCOND) && (pte & avpn) != 0)) {\n" "> -\t\thpte[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);\n" @@ -221,7 +221,7 @@ "> \n" "> @@ -649,7 +643,7 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,\n" "> \tpte = be64_to_cpu(hpte[0]);\n" - "> \tif ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) = 0 ||\n" + "> \tif ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 ||\n" "> \t ((flags & H_AVPN) && (pte & ~0x7fUL) != avpn)) {\n" "> -\t\thpte[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);\n" "> +\t\t__unlock_hpte(hpte, pte);\n" @@ -255,4 +255,4 @@ "> the body of a message to majordomo@vger.kernel.org\n" > More majordomo info at http://vger.kernel.org/majordomo-info.html -4499a8e83da22d74ea60e012887c5128561790fa2f2f8e21c78911e603c27779 +4d662090d6a8e0d74b8f72ea313c9b30ce5fe5ae654bcb9eb5b0edb14288fb48
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.