diff for duplicates of <51BEC0FE.4020805@ozlabs.ru> diff --git a/a/1.txt b/N1/1.txt index d1895d4..987997a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -146,7 +146,7 @@ Ok! >> + 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: @@ -154,7 +154,7 @@ Ok! >> + 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: @@ -162,7 +162,7 @@ Ok! >> + 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: @@ -224,7 +224,7 @@ Ok! >> >> - 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; @@ -240,7 +240,7 @@ Ok! >> + >> + 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; @@ -255,7 +255,7 @@ Ok! >> + 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) @@ -286,12 +286,14 @@ Ok! 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? diff --git a/a/content_digest b/N1/content_digest index e4973d6..1d9e1d7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,15 +3,14 @@ "ref\00A6C24DE-1422-4ABA-A516-2B864F4714F8@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 07:55:42 +0000\0" + "Date\0Mon, 17 Jun 2013 17:55:42 +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 08:06 AM, Alexander Graf wrote:\n" @@ -162,7 +161,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" @@ -170,7 +169,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" @@ -178,7 +177,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" @@ -240,7 +239,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" @@ -256,7 +255,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" @@ -271,7 +270,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" @@ -302,16 +301,18 @@ "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" "\n" "-- \n" Alexey -c68e1e199dc2dcb27fccd76d9ddcf7bc627eeceec63dcb0819594dac37b1c661 +6438aa28fb3abc6db9123942e4c9847158c25a981beb1de68bd2eeed70de1e44
diff --git a/a/1.txt b/N2/1.txt index d1895d4..987997a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -146,7 +146,7 @@ Ok! >> + 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: @@ -154,7 +154,7 @@ Ok! >> + 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: @@ -162,7 +162,7 @@ Ok! >> + 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: @@ -224,7 +224,7 @@ Ok! >> >> - 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; @@ -240,7 +240,7 @@ Ok! >> + >> + 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; @@ -255,7 +255,7 @@ Ok! >> + 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) @@ -286,12 +286,14 @@ Ok! 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? diff --git a/a/content_digest b/N2/content_digest index e4973d6..69d0184 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "ref\00A6C24DE-1422-4ABA-A516-2B864F4714F8@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 07:55:42 +0000\0" + "Date\0Mon, 17 Jun 2013 17:55:42 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" linuxppc-dev@lists.ozlabs.org @@ -162,7 +162,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" @@ -170,7 +170,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" @@ -178,7 +178,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" @@ -240,7 +240,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" @@ -256,7 +256,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" @@ -271,7 +271,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" @@ -302,16 +302,18 @@ "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" "\n" "-- \n" Alexey -c68e1e199dc2dcb27fccd76d9ddcf7bc627eeceec63dcb0819594dac37b1c661 +f7db0cc96d5fbf9a0fca66ee5a0d464768d667b5ed2fda6055423319259e6dc0
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.