diff for duplicates of <20210225134652.2127648-35-npiggin@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 603ac42..097ba3d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ index 9d2fa21201c1..1bbc46f2cfbf 100644 + ret = kvmppc_h_remove(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_ENTER: @@ -27,37 +27,37 @@ index 9d2fa21201c1..1bbc46f2cfbf 100644 + 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_READ: + ret = kvmppc_h_read(vcpu, kvmppc_get_gpr(vcpu, 4), + kvmppc_get_gpr(vcpu, 5)); -+ if (ret = H_TOO_HARD) ++ if (ret == H_TOO_HARD) + return RESUME_HOST; + break; + case H_CLEAR_MOD: + ret = kvmppc_h_clear_mod(vcpu, kvmppc_get_gpr(vcpu, 4), + kvmppc_get_gpr(vcpu, 5)); -+ if (ret = H_TOO_HARD) ++ if (ret == H_TOO_HARD) + return RESUME_HOST; + break; + case H_CLEAR_REF: + ret = kvmppc_h_clear_ref(vcpu, kvmppc_get_gpr(vcpu, 4), + kvmppc_get_gpr(vcpu, 5)); -+ if (ret = H_TOO_HARD) ++ if (ret == H_TOO_HARD) + return RESUME_HOST; + break; + case H_PROTECT: + ret = kvmppc_h_protect(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_BULK_REMOVE: + ret = kvmppc_h_bulk_remove(vcpu); -+ if (ret = H_TOO_HARD) ++ if (ret == H_TOO_HARD) + return RESUME_HOST; + break; + @@ -68,7 +68,7 @@ index 9d2fa21201c1..1bbc46f2cfbf 100644 default: return RESUME_HOST; } -+ WARN_ON_ONCE(ret = H_TOO_HARD); ++ WARN_ON_ONCE(ret == H_TOO_HARD); kvmppc_set_gpr(vcpu, 3, ret); vcpu->arch.hcall_needed = 0; return RESUME_GUEST; @@ -78,12 +78,12 @@ index 9d2fa21201c1..1bbc46f2cfbf 100644 */ - case BOOK3S_INTERRUPT_H_DATA_STORAGE: - r = RESUME_PAGE_FAULT; -- if (vcpu->arch.fault_dsisr = HDSISR_CANARY) +- if (vcpu->arch.fault_dsisr == HDSISR_CANARY) + case BOOK3S_INTERRUPT_H_DATA_STORAGE: { + unsigned long vsid; + long err; + -+ if (vcpu->arch.fault_dsisr = HDSISR_CANARY) { ++ if (vcpu->arch.fault_dsisr == HDSISR_CANARY) { r = RESUME_GUEST; /* Just retry if it's the canary */ + break; + } @@ -105,9 +105,9 @@ index 9d2fa21201c1..1bbc46f2cfbf 100644 + } + err = kvmppc_hpte_hv_fault(vcpu, vcpu->arch.fault_dar, + vsid, vcpu->arch.fault_dsisr, true); -+ if (err = 0) { ++ if (err == 0) { + r = RESUME_GUEST; -+ } else if (err = -1 || err = -2) { ++ } else if (err == -1 || err == -2) { + r = RESUME_PAGE_FAULT; + } else { + kvmppc_core_queue_data_storage(vcpu, vcpu->arch.fault_dar, err); @@ -144,9 +144,9 @@ index 9d2fa21201c1..1bbc46f2cfbf 100644 + } + err = kvmppc_hpte_hv_fault(vcpu, vcpu->arch.fault_dar, + vsid, vcpu->arch.fault_dsisr, false); -+ if (err = 0) { ++ if (err == 0) { + r = RESUME_GUEST; -+ } else if (err = -1) { ++ } else if (err == -1) { + r = RESUME_PAGE_FAULT; + } else { + kvmppc_core_queue_inst_storage(vcpu, err); diff --git a/a/content_digest b/N1/content_digest index 8389022..c87ac81 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020210225134652.2127648-1-npiggin@gmail.com\0" "From\0Nicholas Piggin <npiggin@gmail.com>\0" "Subject\0[PATCH v2 34/37] KVM: PPC: Book3S HV: add virtual mode handlers for HPT hcalls and page faults\0" - "Date\0Thu, 25 Feb 2021 13:46:49 +0000\0" + "Date\0Thu, 25 Feb 2021 23:46:49 +1000\0" "To\0kvm-ppc@vger.kernel.org\0" "Cc\0linuxppc-dev@lists.ozlabs.org" " Nicholas Piggin <npiggin@gmail.com>\0" @@ -28,7 +28,7 @@ "+\t\tret = kvmppc_h_remove(vcpu, kvmppc_get_gpr(vcpu, 4),\n" "+\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" "+\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_ENTER:\n" @@ -36,37 +36,37 @@ "+\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" "+\t\t\t\t\tkvmppc_get_gpr(vcpu, 6),\n" "+\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_READ:\n" "+\t\tret = kvmppc_h_read(vcpu, kvmppc_get_gpr(vcpu, 4),\n" "+\t\t\t\t\tkvmppc_get_gpr(vcpu, 5));\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_CLEAR_MOD:\n" "+\t\tret = kvmppc_h_clear_mod(vcpu, kvmppc_get_gpr(vcpu, 4),\n" "+\t\t\t\t\tkvmppc_get_gpr(vcpu, 5));\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_CLEAR_REF:\n" "+\t\tret = kvmppc_h_clear_ref(vcpu, kvmppc_get_gpr(vcpu, 4),\n" "+\t\t\t\t\tkvmppc_get_gpr(vcpu, 5));\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_PROTECT:\n" "+\t\tret = kvmppc_h_protect(vcpu, kvmppc_get_gpr(vcpu, 4),\n" "+\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" "+\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_BULK_REMOVE:\n" "+\t\tret = kvmppc_h_bulk_remove(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" "+\n" @@ -77,7 +77,7 @@ " \tdefault:\n" " \t\treturn RESUME_HOST;\n" " \t}\n" - "+\tWARN_ON_ONCE(ret = H_TOO_HARD);\n" + "+\tWARN_ON_ONCE(ret == H_TOO_HARD);\n" " \tkvmppc_set_gpr(vcpu, 3, ret);\n" " \tvcpu->arch.hcall_needed = 0;\n" " \treturn RESUME_GUEST;\n" @@ -87,12 +87,12 @@ " \t */\n" "-\tcase BOOK3S_INTERRUPT_H_DATA_STORAGE:\n" "-\t\tr = RESUME_PAGE_FAULT;\n" - "-\t\tif (vcpu->arch.fault_dsisr = HDSISR_CANARY)\n" + "-\t\tif (vcpu->arch.fault_dsisr == HDSISR_CANARY)\n" "+\tcase BOOK3S_INTERRUPT_H_DATA_STORAGE: {\n" "+\t\tunsigned long vsid;\n" "+\t\tlong err;\n" "+\n" - "+\t\tif (vcpu->arch.fault_dsisr = HDSISR_CANARY) {\n" + "+\t\tif (vcpu->arch.fault_dsisr == HDSISR_CANARY) {\n" " \t\t\tr = RESUME_GUEST; /* Just retry if it's the canary */\n" "+\t\t\tbreak;\n" "+\t\t}\n" @@ -114,9 +114,9 @@ "+\t\t}\n" "+\t\terr = kvmppc_hpte_hv_fault(vcpu, vcpu->arch.fault_dar,\n" "+\t\t\t\tvsid, vcpu->arch.fault_dsisr, true);\n" - "+\t\tif (err = 0) {\n" + "+\t\tif (err == 0) {\n" "+\t\t\tr = RESUME_GUEST;\n" - "+\t\t} else if (err = -1 || err = -2) {\n" + "+\t\t} else if (err == -1 || err == -2) {\n" "+\t\t\tr = RESUME_PAGE_FAULT;\n" "+\t\t} else {\n" "+\t\t\tkvmppc_core_queue_data_storage(vcpu, vcpu->arch.fault_dar, err);\n" @@ -153,9 +153,9 @@ "+\t\t}\n" "+\t\terr = kvmppc_hpte_hv_fault(vcpu, vcpu->arch.fault_dar,\n" "+\t\t\t\tvsid, vcpu->arch.fault_dsisr, false);\n" - "+\t\tif (err = 0) {\n" + "+\t\tif (err == 0) {\n" "+\t\t\tr = RESUME_GUEST;\n" - "+\t\t} else if (err = -1) {\n" + "+\t\t} else if (err == -1) {\n" "+\t\t\tr = RESUME_PAGE_FAULT;\n" "+\t\t} else {\n" "+\t\t\tkvmppc_core_queue_inst_storage(vcpu, err);\n" @@ -170,4 +170,4 @@ "-- \n" 2.23.0 -171634603cb551c072a7f3b3d59ae6063771c5b50977c2aed9ca9400e42345bf +38bc6a4274aef0a711bb546c213059f18dfdccfe18af15f368e575353e795fc1
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.