From: Benjamin Herrenschmidt <benh@kernel•crashing.org>
To: Liu Ping Fan <kernelfans@gmail•com>
Cc: Paul Mackerras <paulus@samba•org>,
linuxppc-dev@lists•ozlabs.org, Alexander Graf <agraf@suse•de>,
kvm-ppc@vger•kernel.org
Subject: Re: [PATCH] powerpc: kvm: make the setup of hpte under the protection of KVMPPC_RMAP_LOCK_BIT
Date: Mon, 28 Jul 2014 16:42:21 +1000 [thread overview]
Message-ID: <1406529741.4935.48.camel@pasglop> (raw)
In-Reply-To: <1406527744-25316-1-git-send-email-pingfank@linux.vnet.ibm.com>
On Mon, 2014-07-28 at 14:09 +0800, Liu Ping Fan wrote:
> In current code, the setup of hpte is under the risk of race with
> mmu_notifier_invalidate, i.e we may setup a hpte with a invalid pfn.
> Resolve this issue by sync the two actions by KVMPPC_RMAP_LOCK_BIT.
Please describe the race you think you see. I'm quite sure both Paul and
I went over that code and somewhat convinced ourselves that it was ok
but it's possible that we were both wrong :-)
Cheers,
Ben.
> Signed-off-by: Liu Ping Fan <pingfank@linux•vnet.ibm.com>
> ---
> arch/powerpc/kvm/book3s_64_mmu_hv.c | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
> index 8056107..e6dcff4 100644
> --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
> +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
> @@ -754,19 +754,24 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,
>
> if (hptep[0] & HPTE_V_VALID) {
> /* HPTE was previously valid, so we need to invalidate it */
> - unlock_rmap(rmap);
> hptep[0] |= HPTE_V_ABSENT;
> kvmppc_invalidate_hpte(kvm, hptep, index);
> /* don't lose previous R and C bits */
> r |= hptep[1] & (HPTE_R_R | HPTE_R_C);
> +
> + hptep[1] = r;
> + eieio();
> + hptep[0] = hpte[0];
> + asm volatile("ptesync" : : : "memory");
> + unlock_rmap(rmap);
> } else {
> + hptep[1] = r;
> + eieio();
> + hptep[0] = hpte[0];
> + asm volatile("ptesync" : : : "memory");
> kvmppc_add_revmap_chain(kvm, rev, rmap, index, 0);
> }
>
> - hptep[1] = r;
> - eieio();
> - hptep[0] = hpte[0];
> - asm volatile("ptesync" : : : "memory");
> preempt_enable();
> if (page && hpte_is_writable(r))
> SetPageDirty(page);
next prev parent reply other threads:[~2014-07-28 6:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-28 6:09 [PATCH] powerpc: kvm: make the setup of hpte under the protection of KVMPPC_RMAP_LOCK_BIT Liu Ping Fan
2014-07-28 6:42 ` Benjamin Herrenschmidt [this message]
2014-07-28 7:58 ` Liu ping fan
2014-07-29 6:57 ` Benjamin Herrenschmidt
2014-07-29 8:07 ` Liu ping fan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406529741.4935.48.camel@pasglop \
--to=benh@kernel$(echo .)crashing.org \
--cc=agraf@suse$(echo .)de \
--cc=kernelfans@gmail$(echo .)com \
--cc=kvm-ppc@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox