From patchwork Thu Sep 26 09:46:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162199 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 447DF13B1 for ; Thu, 26 Sep 2019 09:51:47 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 207B52053B for ; Thu, 26 Sep 2019 09:51:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="Ua3MS6ur" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 207B52053B Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDQQM-0001Rn-JE; Thu, 26 Sep 2019 09:50:58 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDQQJ-0001Ka-6l for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:50:55 +0000 X-Inumbo-ID: 21d1bdcc-e043-11e9-bf31-bc764e2007e4 Received: from smtp-fw-6001.amazon.com (unknown [52.95.48.154]) by localhost (Halon) with ESMTPS id 21d1bdcc-e043-11e9-bf31-bc764e2007e4; Thu, 26 Sep 2019 09:50:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491454; x=1601027454; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=EWA3h2guB9NBCcDuy07jNu66y3K3A4xPKuQuLcY6GoU=; b=Ua3MS6urZubWVLuZ4eHMMSV5RNLAxVW7lnBU3N3Ya89EcIXg0eT99Zxp 7g9Bslv81/3sCzk0OHiL6J5DKOjLTXEBt7LY96bebP5nBcLDeAZ/GepV9 z+qdjH21Bjg0OvJ4qWTljkrLkEJtG9qLLMK7Aoo/XFXvh74dKjYmoJL6A 4=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="417788627" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1e-97fdccfd.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6001.iad6.amazon.com with ESMTP; 26 Sep 2019 09:50:54 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1e-97fdccfd.us-east-1.amazon.com (Postfix) with ESMTPS id CEFD3A1E17; Thu, 26 Sep 2019 09:50:52 +0000 (UTC) Received: from EX13D28EUB004.ant.amazon.com (10.43.166.176) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:50:13 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D28EUB004.ant.amazon.com (10.43.166.176) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:50:12 +0000 Received: from u9d785c4ba99158.ant.amazon.com (10.125.106.58) by mail-relay.amazon.com (10.43.160.118) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Thu, 26 Sep 2019 09:50:09 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:45 +0100 Message-ID: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [RFC PATCH 82/84] x86: deduplicate code a bit and fix an unmapping bug. X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Wei Liu , Jan Beulich , Hongyan Xia Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Hongyan Xia Signed-off-by: Hongyan Xia --- xen/arch/x86/domain_page.c | 28 +++++++++++----------------- xen/arch/x86/pv/dom0_build.c | 2 +- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index f606677ae6..782dd0650c 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -77,29 +77,16 @@ void *map_domain_page(mfn_t mfn) struct mapcache_domain *dcache; struct mapcache_vcpu *vcache; struct vcpu_maphash_entry *hashent; + void *ret; v = mapcache_current_vcpu(); if ( !v ) - { - void *ret; - pmap_lock(); - ret = pmap_map(mfn); - pmap_unlock(); - flush_tlb_one_local(ret); - return ret; - } + goto pmap; dcache = &v->domain->arch.mapcache; vcache = &v->arch.mapcache; if ( !dcache->inuse ) - { - void *ret; - pmap_lock(); - ret = pmap_map(mfn); - pmap_unlock(); - flush_tlb_one_local(ret); - return ret; - } + goto pmap; perfc_incr(map_domain_page_count); @@ -179,9 +166,16 @@ void *map_domain_page(mfn_t mfn) l1e_write(&MAPCACHE_L1ENT(idx), l1e_from_mfn(mfn, __PAGE_HYPERVISOR_RW)); - out: +out: local_irq_restore(flags); return (void *)MAPCACHE_VIRT_START + pfn_to_paddr(idx); + +pmap: + pmap_lock(); + ret = pmap_map(mfn); + pmap_unlock(); + flush_tlb_one_local(ret); + return ret; } void unmap_domain_page(const void *ptr) diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index 1555a61b84..202edcaa17 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -236,7 +236,7 @@ static __init void setup_pv_physmap(struct domain *d, unsigned long pgtbl_pfn, if ( pl3e ) unmap_domain_page(pl3e); - //unmap_domain_page(l4start); + unmap_domain_page(l4start); } static struct page_info * __init alloc_chunk(struct domain *d,