diff for duplicates of <51BECA2B.60401@ozlabs.ru> diff --git a/a/1.txt b/N1/1.txt index 13efd90..b742dcb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -159,7 +159,7 @@ do it (no idea about it). Does it really have to be in this file? >>>> + ret = kvmppc_virtmode_h_put_tce(vcpu, kvmppc_get_gpr(vcpu, 4), >>>> + kvmppc_get_gpr(vcpu, 5), >>>> + kvmppc_get_gpr(vcpu, 6)); ->>>> + if (ret = H_TOO_HARD) +>>>> + if (ret == H_TOO_HARD) >>>> + return RESUME_HOST; >>>> + break; >>>> + case H_PUT_TCE_INDIRECT: @@ -167,7 +167,7 @@ do it (no idea about it). Does it really have to be in this file? >>>> + kvmppc_get_gpr(vcpu, 5), >>>> + kvmppc_get_gpr(vcpu, 6), >>>> + kvmppc_get_gpr(vcpu, 7)); ->>>> + if (ret = H_TOO_HARD) +>>>> + if (ret == H_TOO_HARD) >>>> + return RESUME_HOST; >>>> + break; >>>> + case H_STUFF_TCE: @@ -175,7 +175,7 @@ do it (no idea about it). Does it really have to be in this file? >>>> + kvmppc_get_gpr(vcpu, 5), >>>> + kvmppc_get_gpr(vcpu, 6), >>>> + kvmppc_get_gpr(vcpu, 7)); ->>>> + if (ret = H_TOO_HARD) +>>>> + if (ret == H_TOO_HARD) >>>> + return RESUME_HOST; >>>> + break; >>>> default: @@ -237,7 +237,7 @@ do it (no idea about it). Does it really have to be in this file? >>>> >>>> - rc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce); >>>> + rc = kvmppc_virtmode_h_put_tce(vcpu, liobn, ioba, tce); ->>>> + if (rc = H_TOO_HARD) +>>>> + if (rc == H_TOO_HARD) >>>> + return EMULATE_FAIL; >>>> + kvmppc_set_gpr(vcpu, 3, rc); >>>> + return EMULATE_DONE; @@ -253,7 +253,7 @@ do it (no idea about it). Does it really have to be in this file? >>>> + >>>> + rc = kvmppc_virtmode_h_put_tce_indirect(vcpu, liobn, ioba, >>>> + tce, npages); ->>>> + if (rc = H_TOO_HARD) +>>>> + if (rc == H_TOO_HARD) >>>> + return EMULATE_FAIL; >>>> + kvmppc_set_gpr(vcpu, 3, rc); >>>> + return EMULATE_DONE; @@ -268,7 +268,7 @@ do it (no idea about it). Does it really have to be in this file? >>>> + long rc; >>>> + >>>> + rc = kvmppc_virtmode_h_stuff_tce(vcpu, liobn, ioba, tce_value, npages); ->>>> if (rc = H_TOO_HARD) +>>>> if (rc == H_TOO_HARD) >>>> return EMULATE_FAIL; >>>> kvmppc_set_gpr(vcpu, 3, rc); >>>> @@ -247,6 +278,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) @@ -299,12 +299,14 @@ do it (no idea about it). Does it really have to be in this file? >> We had this discussion with v2. >> >> David: ->> =>> So, in the case of MULTITCE, that's not quite right. PR KVM can +>> === +>> So, in the case of MULTITCE, that's not quite right. PR KVM can >> emulate a PAPR system on a BookE machine, and there's no reason not to >> allow TCE acceleration as well. We can't make it dependent on PAPR >> mode being selected, because that's enabled per-vcpu, whereas these >> capabilities are queried on the VM before the vcpus are created. ->> =>> +>> === +>> >> Wrong? > Partially. BookE can not emulate a PAPR system as it stands today. diff --git a/a/content_digest b/N1/content_digest index 6a9c358..89a19b6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,15 +5,14 @@ "ref\0F3AAE42F-F325-462B-AD22-F3E568C39A8C@suse.de\0" "From\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" "Subject\0Re: [PATCH 1/4] KVM: PPC: Add support for multiple-TCE hcalls\0" - "Date\0Mon, 17 Jun 2013 08:34:51 +0000\0" + "Date\0Mon, 17 Jun 2013 18:34:51 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" - "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" - linuxppc-dev@lists.ozlabs.org - David Gibson <david@gibson.dropbear.id.au> - Paul Mackerras <paulus@samba.org> - kvm@vger.kernel.org + "Cc\0kvm@vger.kernel.org" linux-kernel@vger.kernel.org - " kvm-ppc@vger.kernel.org\0" + kvm-ppc@vger.kernel.org + Paul Mackerras <paulus@samba.org> + linuxppc-dev@lists.ozlabs.org + " David Gibson <david@gibson.dropbear.id.au>\0" "\00:1\0" "b\0" "On 06/17/2013 06:02 PM, Alexander Graf wrote:\n" @@ -177,7 +176,7 @@ ">>>> +\t\tret = kvmppc_virtmode_h_put_tce(vcpu, kvmppc_get_gpr(vcpu, 4),\n" ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6));\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_PUT_TCE_INDIRECT:\n" @@ -185,7 +184,7 @@ ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6),\n" ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 7));\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_STUFF_TCE:\n" @@ -193,7 +192,7 @@ ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6),\n" ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 7));\n" - ">>>> +\t\tif (ret = H_TOO_HARD)\n" + ">>>> +\t\tif (ret == H_TOO_HARD)\n" ">>>> +\t\t\treturn RESUME_HOST;\n" ">>>> +\t\tbreak;\n" ">>>> \tdefault:\n" @@ -255,7 +254,7 @@ ">>>>\n" ">>>> -\trc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce);\n" ">>>> +\trc = kvmppc_virtmode_h_put_tce(vcpu, liobn, ioba, tce);\n" - ">>>> +\tif (rc = H_TOO_HARD)\n" + ">>>> +\tif (rc == H_TOO_HARD)\n" ">>>> +\t\treturn EMULATE_FAIL;\n" ">>>> +\tkvmppc_set_gpr(vcpu, 3, rc);\n" ">>>> +\treturn EMULATE_DONE;\n" @@ -271,7 +270,7 @@ ">>>> +\n" ">>>> +\trc = kvmppc_virtmode_h_put_tce_indirect(vcpu, liobn, ioba,\n" ">>>> +\t\t\ttce, npages);\n" - ">>>> +\tif (rc = H_TOO_HARD)\n" + ">>>> +\tif (rc == H_TOO_HARD)\n" ">>>> +\t\treturn EMULATE_FAIL;\n" ">>>> +\tkvmppc_set_gpr(vcpu, 3, rc);\n" ">>>> +\treturn EMULATE_DONE;\n" @@ -286,7 +285,7 @@ ">>>> +\tlong rc;\n" ">>>> +\n" ">>>> +\trc = kvmppc_virtmode_h_stuff_tce(vcpu, liobn, ioba, tce_value, npages);\n" - ">>>> \tif (rc = H_TOO_HARD)\n" + ">>>> \tif (rc == H_TOO_HARD)\n" ">>>> \t\treturn EMULATE_FAIL;\n" ">>>> \tkvmppc_set_gpr(vcpu, 3, rc);\n" ">>>> @@ -247,6 +278,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)\n" @@ -317,12 +316,14 @@ ">> We had this discussion with v2.\n" ">>\n" ">> David:\n" - ">> =>> So, in the case of MULTITCE, that's not quite right. PR KVM can\n" + ">> ===\n" + ">> So, in the case of MULTITCE, that's not quite right. PR KVM can\n" ">> emulate a PAPR system on a BookE machine, and there's no reason not to\n" ">> allow TCE acceleration as well. We can't make it dependent on PAPR\n" ">> mode being selected, because that's enabled per-vcpu, whereas these\n" ">> capabilities are queried on the VM before the vcpus are created.\n" - ">> =>>\n" + ">> ===\n" + ">>\n" ">> Wrong?\n" "\n" "> Partially. BookE can not emulate a PAPR system as it stands today.\n" @@ -337,4 +338,4 @@ "-- \n" Alexey -86207d91edae795219b4aa2dec931a54b8464506d1ca27fadb48cbd09da213b6 +97c9161965467a8ebd11553b1558ce73980a7f360b61dd7139f1aad7302994eb
diff --git a/a/1.txt b/N2/1.txt index 13efd90..b742dcb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -159,7 +159,7 @@ do it (no idea about it). Does it really have to be in this file? >>>> + ret = kvmppc_virtmode_h_put_tce(vcpu, kvmppc_get_gpr(vcpu, 4), >>>> + kvmppc_get_gpr(vcpu, 5), >>>> + kvmppc_get_gpr(vcpu, 6)); ->>>> + if (ret = H_TOO_HARD) +>>>> + if (ret == H_TOO_HARD) >>>> + return RESUME_HOST; >>>> + break; >>>> + case H_PUT_TCE_INDIRECT: @@ -167,7 +167,7 @@ do it (no idea about it). Does it really have to be in this file? >>>> + kvmppc_get_gpr(vcpu, 5), >>>> + kvmppc_get_gpr(vcpu, 6), >>>> + kvmppc_get_gpr(vcpu, 7)); ->>>> + if (ret = H_TOO_HARD) +>>>> + if (ret == H_TOO_HARD) >>>> + return RESUME_HOST; >>>> + break; >>>> + case H_STUFF_TCE: @@ -175,7 +175,7 @@ do it (no idea about it). Does it really have to be in this file? >>>> + kvmppc_get_gpr(vcpu, 5), >>>> + kvmppc_get_gpr(vcpu, 6), >>>> + kvmppc_get_gpr(vcpu, 7)); ->>>> + if (ret = H_TOO_HARD) +>>>> + if (ret == H_TOO_HARD) >>>> + return RESUME_HOST; >>>> + break; >>>> default: @@ -237,7 +237,7 @@ do it (no idea about it). Does it really have to be in this file? >>>> >>>> - rc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce); >>>> + rc = kvmppc_virtmode_h_put_tce(vcpu, liobn, ioba, tce); ->>>> + if (rc = H_TOO_HARD) +>>>> + if (rc == H_TOO_HARD) >>>> + return EMULATE_FAIL; >>>> + kvmppc_set_gpr(vcpu, 3, rc); >>>> + return EMULATE_DONE; @@ -253,7 +253,7 @@ do it (no idea about it). Does it really have to be in this file? >>>> + >>>> + rc = kvmppc_virtmode_h_put_tce_indirect(vcpu, liobn, ioba, >>>> + tce, npages); ->>>> + if (rc = H_TOO_HARD) +>>>> + if (rc == H_TOO_HARD) >>>> + return EMULATE_FAIL; >>>> + kvmppc_set_gpr(vcpu, 3, rc); >>>> + return EMULATE_DONE; @@ -268,7 +268,7 @@ do it (no idea about it). Does it really have to be in this file? >>>> + long rc; >>>> + >>>> + rc = kvmppc_virtmode_h_stuff_tce(vcpu, liobn, ioba, tce_value, npages); ->>>> if (rc = H_TOO_HARD) +>>>> if (rc == H_TOO_HARD) >>>> return EMULATE_FAIL; >>>> kvmppc_set_gpr(vcpu, 3, rc); >>>> @@ -247,6 +278,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) @@ -299,12 +299,14 @@ do it (no idea about it). Does it really have to be in this file? >> We had this discussion with v2. >> >> David: ->> =>> So, in the case of MULTITCE, that's not quite right. PR KVM can +>> === +>> So, in the case of MULTITCE, that's not quite right. PR KVM can >> emulate a PAPR system on a BookE machine, and there's no reason not to >> allow TCE acceleration as well. We can't make it dependent on PAPR >> mode being selected, because that's enabled per-vcpu, whereas these >> capabilities are queried on the VM before the vcpus are created. ->> =>> +>> === +>> >> Wrong? > Partially. BookE can not emulate a PAPR system as it stands today. diff --git a/a/content_digest b/N2/content_digest index 6a9c358..a8a6063 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,7 +5,7 @@ "ref\0F3AAE42F-F325-462B-AD22-F3E568C39A8C@suse.de\0" "From\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" "Subject\0Re: [PATCH 1/4] KVM: PPC: Add support for multiple-TCE hcalls\0" - "Date\0Mon, 17 Jun 2013 08:34:51 +0000\0" + "Date\0Mon, 17 Jun 2013 18:34:51 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" linuxppc-dev@lists.ozlabs.org @@ -177,7 +177,7 @@ ">>>> +\t\tret = kvmppc_virtmode_h_put_tce(vcpu, kvmppc_get_gpr(vcpu, 4),\n" ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6));\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_PUT_TCE_INDIRECT:\n" @@ -185,7 +185,7 @@ ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6),\n" ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 7));\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_STUFF_TCE:\n" @@ -193,7 +193,7 @@ ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6),\n" ">>>> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 7));\n" - ">>>> +\t\tif (ret = H_TOO_HARD)\n" + ">>>> +\t\tif (ret == H_TOO_HARD)\n" ">>>> +\t\t\treturn RESUME_HOST;\n" ">>>> +\t\tbreak;\n" ">>>> \tdefault:\n" @@ -255,7 +255,7 @@ ">>>>\n" ">>>> -\trc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce);\n" ">>>> +\trc = kvmppc_virtmode_h_put_tce(vcpu, liobn, ioba, tce);\n" - ">>>> +\tif (rc = H_TOO_HARD)\n" + ">>>> +\tif (rc == H_TOO_HARD)\n" ">>>> +\t\treturn EMULATE_FAIL;\n" ">>>> +\tkvmppc_set_gpr(vcpu, 3, rc);\n" ">>>> +\treturn EMULATE_DONE;\n" @@ -271,7 +271,7 @@ ">>>> +\n" ">>>> +\trc = kvmppc_virtmode_h_put_tce_indirect(vcpu, liobn, ioba,\n" ">>>> +\t\t\ttce, npages);\n" - ">>>> +\tif (rc = H_TOO_HARD)\n" + ">>>> +\tif (rc == H_TOO_HARD)\n" ">>>> +\t\treturn EMULATE_FAIL;\n" ">>>> +\tkvmppc_set_gpr(vcpu, 3, rc);\n" ">>>> +\treturn EMULATE_DONE;\n" @@ -286,7 +286,7 @@ ">>>> +\tlong rc;\n" ">>>> +\n" ">>>> +\trc = kvmppc_virtmode_h_stuff_tce(vcpu, liobn, ioba, tce_value, npages);\n" - ">>>> \tif (rc = H_TOO_HARD)\n" + ">>>> \tif (rc == H_TOO_HARD)\n" ">>>> \t\treturn EMULATE_FAIL;\n" ">>>> \tkvmppc_set_gpr(vcpu, 3, rc);\n" ">>>> @@ -247,6 +278,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)\n" @@ -317,12 +317,14 @@ ">> We had this discussion with v2.\n" ">>\n" ">> David:\n" - ">> =>> So, in the case of MULTITCE, that's not quite right. PR KVM can\n" + ">> ===\n" + ">> So, in the case of MULTITCE, that's not quite right. PR KVM can\n" ">> emulate a PAPR system on a BookE machine, and there's no reason not to\n" ">> allow TCE acceleration as well. We can't make it dependent on PAPR\n" ">> mode being selected, because that's enabled per-vcpu, whereas these\n" ">> capabilities are queried on the VM before the vcpus are created.\n" - ">> =>>\n" + ">> ===\n" + ">>\n" ">> Wrong?\n" "\n" "> Partially. BookE can not emulate a PAPR system as it stands today.\n" @@ -337,4 +339,4 @@ "-- \n" Alexey -86207d91edae795219b4aa2dec931a54b8464506d1ca27fadb48cbd09da213b6 +b62fed60b7c7152b9f1852d22e057626cffd46454927eb3787fa250edc99e277
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.