From patchwork Thu Sep 26 09:46:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162157 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 25C9C13BD for ; Thu, 26 Sep 2019 09:50: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 00250222C0 for ; Thu, 26 Sep 2019 09:50:46 +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="HqJAy0lr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 00250222C0 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 1iDQPJ-00076l-Op; Thu, 26 Sep 2019 09:49:53 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDQPH-000733-Ud for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:49:51 +0000 X-Inumbo-ID: fc110368-e042-11e9-97fb-bc764e2007e4 Received: from smtp-fw-6002.amazon.com (unknown [52.95.49.90]) by localhost (Halon) with ESMTPS id fc110368-e042-11e9-97fb-bc764e2007e4; Thu, 26 Sep 2019 09:49:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491391; x=1601027391; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=BGeUL/mcPd5wEv8IOXu2uKjLO1fDkSD+qYwjUV4qteY=; b=HqJAy0lrGaegXSfls0093bWeJpmcath64yRBreeMaLbkuuekiuw5Do8a kz+LXDjbc9zoiIJsRc/vKfP/8i/C6qakYC1iLyEyBEfWzwJ9qCvBssYGr qDtG2aXulInpvK3kJTAZlePrBDl8ddRvld6HU2A8aSuqerVPu26UHNx6N A=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="423750777" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1a-715bee71.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6002.iad6.amazon.com with ESMTP; 26 Sep 2019 09:49:51 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1a-715bee71.us-east-1.amazon.com (Postfix) with ESMTPS id AF268A236F; Thu, 26 Sep 2019 09:49:47 +0000 (UTC) Received: from EX13D28EUC002.ant.amazon.com (10.43.164.254) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:49:31 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D28EUC002.ant.amazon.com (10.43.164.254) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:49:30 +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:49:26 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:34 +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 71/84] x86/setup: start tearing down the direct map. 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: Stefano Stabellini , Wei Liu , Hongyan Xia , George Dunlap , Andrew Cooper , Konrad Rzeszutek Wilk , Ian Jackson , Tim Deegan , Julien Grall , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Hongyan Xia Signed-off-by: Hongyan Xia --- xen/arch/x86/setup.c | 4 ++-- xen/common/page_alloc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index e964c032f6..3dc2fad987 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1367,7 +1367,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( map_e < end ) { - map_pages_to_xen((unsigned long)__va(map_e), maddr_to_mfn(map_e), + map_pages_to_xen((unsigned long)__va(map_e), INVALID_MFN, PFN_DOWN(end - map_e), PAGE_HYPERVISOR); init_boot_pages(map_e, end); map_e = end; @@ -1382,7 +1382,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) } if ( s < map_s ) { - map_pages_to_xen((unsigned long)__va(s), maddr_to_mfn(s), + map_pages_to_xen((unsigned long)__va(s), INVALID_MFN, PFN_DOWN(map_s - s), PAGE_HYPERVISOR); init_boot_pages(s, map_s); } diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index a00db4c0d9..deeeac065c 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2157,7 +2157,7 @@ void *alloc_xenheap_pages(unsigned int order, unsigned int memflags) map_pages_to_xen((unsigned long)ret, page_to_mfn(pg), 1UL << order, PAGE_HYPERVISOR); - return page_to_virt(pg); + return ret; }