From patchwork Thu Sep 26 09:46:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162117 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 710051709 for ; Thu, 26 Sep 2019 09:50:13 +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 4CCC4222C0 for ; Thu, 26 Sep 2019 09:50:13 +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="K7q9PWZE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4CCC4222C0 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 1iDQON-0005Ff-O1; Thu, 26 Sep 2019 09:48:55 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDQOM-0005D5-6h for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:48:54 +0000 X-Inumbo-ID: d9e130ce-e042-11e9-8628-bc764e2007e4 Received: from smtp-fw-4101.amazon.com (unknown [72.21.198.25]) by localhost (Halon) with ESMTPS id d9e130ce-e042-11e9-8628-bc764e2007e4; Thu, 26 Sep 2019 09:48:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491333; x=1601027333; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=1aordIdIJbykTsdjQxOL5oa92i7bkfOlz+OB+WQS6D8=; b=K7q9PWZExsV8Wk5W2u9d0H/fSuvhRVMkHR8EuiLrurYnUx2Os1xXhX82 yp5dksK4X0SAKJ12QMBj/67e6mBDeTxpxFhkQRM+jmyb1Jb5YjdRECqrV N4LnHc3+1k+AlfuvKgeLRhwXUdZljD63UlDtKeUhmRFaDkkOtb4cJB6iR 8=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="787535196" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1a-af6a10df.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-4101.iad4.amazon.com with ESMTP; 26 Sep 2019 09:48:53 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1a-af6a10df.us-east-1.amazon.com (Postfix) with ESMTPS id 48ED2A23EF; Thu, 26 Sep 2019 09:48:52 +0000 (UTC) Received: from EX13D28EUB001.ant.amazon.com (10.43.166.50) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:51 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D28EUB001.ant.amazon.com (10.43.166.50) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:50 +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:48:47 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:23 +0100 Message-ID: <4b8e2d635bedc8a51281cac0eb93b6761c1eec5c.1569489002.git.hongyax@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [RFC PATCH 60/84] x86/domain_page: use PMAP when d/vcache is not ready. 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 Also fix a place where unmap_domain_page should only be conditionally used. Signed-off-by: Hongyan Xia --- xen/arch/x86/domain_page.c | 27 ++++++++++++++++++++++++--- xen/arch/x86/mm.c | 3 ++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 9ea74b456c..bece9d8cd0 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -17,6 +17,8 @@ #include #include #include +#include +#include static DEFINE_PER_CPU(struct vcpu *, override); @@ -83,12 +85,26 @@ void *map_domain_page(mfn_t mfn) v = mapcache_current_vcpu(); if ( !v || !is_pv_vcpu(v) ) - return mfn_to_virt(mfn_x(mfn)); + { + void *ret; + pmap_lock(); + ret = pmap_map(mfn); + pmap_unlock(); + flush_tlb_one_local(ret); + return ret; + } dcache = &v->domain->arch.pv.mapcache; vcache = &v->arch.pv.mapcache; if ( !dcache->inuse ) - return mfn_to_virt(mfn_x(mfn)); + { + void *ret; + pmap_lock(); + ret = pmap_map(mfn); + pmap_unlock(); + flush_tlb_one_local(ret); + return ret; + } perfc_incr(map_domain_page_count); @@ -181,8 +197,13 @@ void unmap_domain_page(const void *ptr) unsigned long va = (unsigned long)ptr, mfn, flags; struct vcpu_maphash_entry *hashent; - if ( va >= DIRECTMAP_VIRT_START ) + if ( va >= FIXADDR_START && va < FIXADDR_TOP ) + { + pmap_lock(); + pmap_unmap((void *)ptr); + pmap_unlock(); return; + } ASSERT(va >= MAPCACHE_VIRT_START && va < MAPCACHE_VIRT_END); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 145c5ab47c..9619182f52 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5949,7 +5949,8 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, if ( rc || !nr || !l1_table_offset(va) ) { /* Note that this is a no-op for the alloc_xenheap_page() case. */ - unmap_domain_page(l1tab); + if( (unsigned long)l1tab < DIRECTMAP_VIRT_START ) + unmap_domain_page(l1tab); l1tab = NULL; } }