diff for duplicates of <53B6628B.6020001@suse.de> diff --git a/a/1.txt b/N1/1.txt index 645da48..71306d1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -125,7 +125,7 @@ On 03.07.14 16:45, Mihai Caraman wrote: > + gfn_t gfn; > + > + /* -> + * Guest TLB management instructions (EPCR.DGTMI = 0) is not +> + * Guest TLB management instructions (EPCR.DGTMI == 0) is not > + * supported for now > + */ > + if (!(vcpu->arch.fault_esr & ESR_PT)) { @@ -139,7 +139,7 @@ Wouldn't this allow a guest to flood the host's kernel log? > + gfn = (vcpu->arch.fault_lper & LPER_ALPN) >> LPER_ALPN_SHIFT; Maybe add an #ifdef and #error check to make sure that LPER_ALPN_SHIFT -= PAGE_SHIFT? +== PAGE_SHIFT? > + > + idx = srcu_read_lock(&vcpu->kvm->srcu); @@ -150,7 +150,8 @@ Maybe add an #ifdef and #error check to make sure that LPER_ALPN_SHIFT > + } else if (vcpu->arch.fault_esr & ESR_DATA) { > + vcpu->arch.paddr_accessed = (gfn << PAGE_SHIFT) > + | (vcpu->arch.fault_dear & (PAGE_SIZE - 1)); -> + vcpu->arch.vaddr_accessed > + vcpu->arch.fault_dear; +> + vcpu->arch.vaddr_accessed = +> + vcpu->arch.fault_dear; > + > + r = kvmppc_emulate_mmio(run, vcpu); > + kvmppc_account_exit(vcpu, MMIO_EXITS); @@ -171,7 +172,7 @@ path, but I can't see any good way to combine them either. > + > case BOOKE_INTERRUPT_DEBUG: { > r = kvmppc_handle_debug(run, vcpu); -> if (r = RESUME_HOST) +> if (r == RESUME_HOST) > diff --git a/arch/powerpc/kvm/bookehv_interrupts.S b/arch/powerpc/kvm/bookehv_interrupts.S > index b3ecdd6..341c3a8 100644 > --- a/arch/powerpc/kvm/bookehv_interrupts.S @@ -273,7 +274,7 @@ we should be faster and not rely on division helpers. Hm? > + -> + if (esel = -1) +> + if (esel == -1) > + esel = lrat_next(); > + __write_host_tlbe(&stlbe, MAS0_ATSEL | MAS0_ESEL(esel)); > + diff --git a/a/content_digest b/N1/content_digest index 778b346..11a27e3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,11 +2,11 @@ "ref\01404398727-12844-3-git-send-email-mihai.caraman@freescale.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [RFC PATCH 2/4] KVM: PPC: Book3E: Handle LRAT error exception\0" - "Date\0Fri, 04 Jul 2014 08:15:07 +0000\0" + "Date\0Fri, 04 Jul 2014 10:15:07 +0200\0" "To\0Mihai Caraman <mihai.caraman@freescale.com>" " kvm-ppc@vger.kernel.org\0" - "Cc\0kvm@vger.kernel.org" - " linuxppc-dev@lists.ozlabs.org\0" + "Cc\0linuxppc-dev@lists.ozlabs.org" + " kvm@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -136,7 +136,7 @@ "> +\t\tgfn_t gfn;\n" "> +\n" "> +\t\t/*\n" - "> +\t\t * Guest TLB management instructions (EPCR.DGTMI = 0) is not\n" + "> +\t\t * Guest TLB management instructions (EPCR.DGTMI == 0) is not\n" "> +\t\t * supported for now\n" "> +\t\t */\n" "> +\t\tif (!(vcpu->arch.fault_esr & ESR_PT)) {\n" @@ -150,7 +150,7 @@ "> +\t\tgfn = (vcpu->arch.fault_lper & LPER_ALPN) >> LPER_ALPN_SHIFT;\n" "\n" "Maybe add an #ifdef and #error check to make sure that LPER_ALPN_SHIFT \n" - "= PAGE_SHIFT?\n" + "== PAGE_SHIFT?\n" "\n" "> +\n" "> +\t\tidx = srcu_read_lock(&vcpu->kvm->srcu);\n" @@ -161,7 +161,8 @@ "> +\t\t} else if (vcpu->arch.fault_esr & ESR_DATA) {\n" "> +\t\t\tvcpu->arch.paddr_accessed = (gfn << PAGE_SHIFT)\n" "> +\t\t\t\t| (vcpu->arch.fault_dear & (PAGE_SIZE - 1));\n" - "> +\t\t\tvcpu->arch.vaddr_accessed > +\t\t\t\tvcpu->arch.fault_dear;\n" + "> +\t\t\tvcpu->arch.vaddr_accessed =\n" + "> +\t\t\t\tvcpu->arch.fault_dear;\n" "> +\n" "> +\t\t\tr = kvmppc_emulate_mmio(run, vcpu);\n" "> +\t\t\tkvmppc_account_exit(vcpu, MMIO_EXITS);\n" @@ -182,7 +183,7 @@ "> +\n" "> \tcase BOOKE_INTERRUPT_DEBUG: {\n" "> \t\tr = kvmppc_handle_debug(run, vcpu);\n" - "> \t\tif (r = RESUME_HOST)\n" + "> \t\tif (r == RESUME_HOST)\n" "> diff --git a/arch/powerpc/kvm/bookehv_interrupts.S b/arch/powerpc/kvm/bookehv_interrupts.S\n" "> index b3ecdd6..341c3a8 100644\n" "> --- a/arch/powerpc/kvm/bookehv_interrupts.S\n" @@ -284,7 +285,7 @@ "Hm?\n" "\n" "> +\n" - "> +\tif (esel = -1)\n" + "> +\tif (esel == -1)\n" "> +\t\tesel = lrat_next();\n" "> +\t__write_host_tlbe(&stlbe, MAS0_ATSEL | MAS0_ESEL(esel));\n" "> +\n" @@ -387,4 +388,4 @@ "> \n" > void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 pid) -eef09153ef71b1f32363c5e2cf5acce4090435f830c25f0832dc2daddff42f83 +7c7685d022ef4bcf8fcd2830a8a206268fdf470fea701942f3d5db4a306db4a8
diff --git a/a/1.txt b/N2/1.txt index 645da48..71306d1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -125,7 +125,7 @@ On 03.07.14 16:45, Mihai Caraman wrote: > + gfn_t gfn; > + > + /* -> + * Guest TLB management instructions (EPCR.DGTMI = 0) is not +> + * Guest TLB management instructions (EPCR.DGTMI == 0) is not > + * supported for now > + */ > + if (!(vcpu->arch.fault_esr & ESR_PT)) { @@ -139,7 +139,7 @@ Wouldn't this allow a guest to flood the host's kernel log? > + gfn = (vcpu->arch.fault_lper & LPER_ALPN) >> LPER_ALPN_SHIFT; Maybe add an #ifdef and #error check to make sure that LPER_ALPN_SHIFT -= PAGE_SHIFT? +== PAGE_SHIFT? > + > + idx = srcu_read_lock(&vcpu->kvm->srcu); @@ -150,7 +150,8 @@ Maybe add an #ifdef and #error check to make sure that LPER_ALPN_SHIFT > + } else if (vcpu->arch.fault_esr & ESR_DATA) { > + vcpu->arch.paddr_accessed = (gfn << PAGE_SHIFT) > + | (vcpu->arch.fault_dear & (PAGE_SIZE - 1)); -> + vcpu->arch.vaddr_accessed > + vcpu->arch.fault_dear; +> + vcpu->arch.vaddr_accessed = +> + vcpu->arch.fault_dear; > + > + r = kvmppc_emulate_mmio(run, vcpu); > + kvmppc_account_exit(vcpu, MMIO_EXITS); @@ -171,7 +172,7 @@ path, but I can't see any good way to combine them either. > + > case BOOKE_INTERRUPT_DEBUG: { > r = kvmppc_handle_debug(run, vcpu); -> if (r = RESUME_HOST) +> if (r == RESUME_HOST) > diff --git a/arch/powerpc/kvm/bookehv_interrupts.S b/arch/powerpc/kvm/bookehv_interrupts.S > index b3ecdd6..341c3a8 100644 > --- a/arch/powerpc/kvm/bookehv_interrupts.S @@ -273,7 +274,7 @@ we should be faster and not rely on division helpers. Hm? > + -> + if (esel = -1) +> + if (esel == -1) > + esel = lrat_next(); > + __write_host_tlbe(&stlbe, MAS0_ATSEL | MAS0_ESEL(esel)); > + diff --git a/a/content_digest b/N2/content_digest index 778b346..393e02f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01404398727-12844-3-git-send-email-mihai.caraman@freescale.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [RFC PATCH 2/4] KVM: PPC: Book3E: Handle LRAT error exception\0" - "Date\0Fri, 04 Jul 2014 08:15:07 +0000\0" + "Date\0Fri, 04 Jul 2014 10:15:07 +0200\0" "To\0Mihai Caraman <mihai.caraman@freescale.com>" " kvm-ppc@vger.kernel.org\0" "Cc\0kvm@vger.kernel.org" @@ -136,7 +136,7 @@ "> +\t\tgfn_t gfn;\n" "> +\n" "> +\t\t/*\n" - "> +\t\t * Guest TLB management instructions (EPCR.DGTMI = 0) is not\n" + "> +\t\t * Guest TLB management instructions (EPCR.DGTMI == 0) is not\n" "> +\t\t * supported for now\n" "> +\t\t */\n" "> +\t\tif (!(vcpu->arch.fault_esr & ESR_PT)) {\n" @@ -150,7 +150,7 @@ "> +\t\tgfn = (vcpu->arch.fault_lper & LPER_ALPN) >> LPER_ALPN_SHIFT;\n" "\n" "Maybe add an #ifdef and #error check to make sure that LPER_ALPN_SHIFT \n" - "= PAGE_SHIFT?\n" + "== PAGE_SHIFT?\n" "\n" "> +\n" "> +\t\tidx = srcu_read_lock(&vcpu->kvm->srcu);\n" @@ -161,7 +161,8 @@ "> +\t\t} else if (vcpu->arch.fault_esr & ESR_DATA) {\n" "> +\t\t\tvcpu->arch.paddr_accessed = (gfn << PAGE_SHIFT)\n" "> +\t\t\t\t| (vcpu->arch.fault_dear & (PAGE_SIZE - 1));\n" - "> +\t\t\tvcpu->arch.vaddr_accessed > +\t\t\t\tvcpu->arch.fault_dear;\n" + "> +\t\t\tvcpu->arch.vaddr_accessed =\n" + "> +\t\t\t\tvcpu->arch.fault_dear;\n" "> +\n" "> +\t\t\tr = kvmppc_emulate_mmio(run, vcpu);\n" "> +\t\t\tkvmppc_account_exit(vcpu, MMIO_EXITS);\n" @@ -182,7 +183,7 @@ "> +\n" "> \tcase BOOKE_INTERRUPT_DEBUG: {\n" "> \t\tr = kvmppc_handle_debug(run, vcpu);\n" - "> \t\tif (r = RESUME_HOST)\n" + "> \t\tif (r == RESUME_HOST)\n" "> diff --git a/arch/powerpc/kvm/bookehv_interrupts.S b/arch/powerpc/kvm/bookehv_interrupts.S\n" "> index b3ecdd6..341c3a8 100644\n" "> --- a/arch/powerpc/kvm/bookehv_interrupts.S\n" @@ -284,7 +285,7 @@ "Hm?\n" "\n" "> +\n" - "> +\tif (esel = -1)\n" + "> +\tif (esel == -1)\n" "> +\t\tesel = lrat_next();\n" "> +\t__write_host_tlbe(&stlbe, MAS0_ATSEL | MAS0_ESEL(esel));\n" "> +\n" @@ -387,4 +388,4 @@ "> \n" > void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 pid) -eef09153ef71b1f32363c5e2cf5acce4090435f830c25f0832dc2daddff42f83 +d5b4fb91ba7dd2c12387e71486e2920ac33c8b7b59ba426ea220d64f8d23093a
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.