From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mukesh Rathor Subject: [PATCH V1] Avoid premature update of M2P in set_typed_p2m_entry Date: Fri, 6 Jun 2014 14:45:28 -0700 Message-ID: <1402091128-13652-1-git-send-email-mukesh.rathor@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wt1xK-00023n-Qh for xen-devel@lists.xenproject.org; Fri, 06 Jun 2014 21:45:47 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: tim@xen.org, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org Update M2P for ram type after p2m_set_entry call has been made, and it succeeds. Signed-off-by: Mukesh Rathor --- xen/arch/x86/mm/p2m.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b50747a..bd2e03f 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -818,20 +818,20 @@ static int set_typed_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn, domain_crash(d); return -ENOENT; } - else if ( p2m_is_ram(ot) ) - { - ASSERT(mfn_valid(omfn)); - set_gpfn_from_mfn(mfn_x(omfn), INVALID_M2P_ENTRY); - } P2M_DEBUG("set %d %lx %lx\n", gfn_p2mt, gfn, mfn_x(mfn)); rc = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, gfn_p2mt, p2m->default_access); - gfn_unlock(p2m, gfn, 0); - if ( rc ) + if ( unlikely(rc) ) gdprintk(XENLOG_ERR, "p2m_set_entry failed! mfn=%08lx rc:%d\n", mfn_x(get_gfn_query_unlocked(p2m->domain, gfn, &ot)), rc); + else if ( p2m_is_ram(ot) ) + { + ASSERT(mfn_valid(omfn)); + set_gpfn_from_mfn(mfn_x(omfn), INVALID_M2P_ENTRY); + } + gfn_unlock(p2m, gfn, 0); return rc; } -- 1.8.3.1