From patchwork Thu Sep 26 09:46:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162155 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 18C381709 for ; Thu, 26 Sep 2019 09:50:43 +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 E8B87222C0 for ; Thu, 26 Sep 2019 09:50:42 +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="eOeIXmhL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8B87222C0 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 1iDQPH-00071t-BR; Thu, 26 Sep 2019 09:49:51 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDQPG-00070h-Ql for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:49:50 +0000 X-Inumbo-ID: de1c7901-e042-11e9-964c-12813bfff9fa Received: from smtp-fw-2101.amazon.com (unknown [72.21.196.25]) by localhost (Halon) with ESMTPS id de1c7901-e042-11e9-964c-12813bfff9fa; Thu, 26 Sep 2019 09:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491342; x=1601027342; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=vgKhVC0ZR1gCJMfDli481PKJCVnBgEwbjfDPwtj0rqo=; b=eOeIXmhLLiPnkaeisxolZ5CP+pav75PghdMtmOeZzmBt+HeVeRNAq8No jnTgGM9W5zUHNwGMxc1vpRjmlfhDecDZJdrd1Rc3+5qIo3SfZqAjRHnJl 4i5xHpzCnWM5zpwdqRx7U+gAziix3UoFK34YZRM76JczucCIR/hZh48NJ g=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="753354297" Received: from iad6-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-1e-17c49630.us-east-1.amazon.com) ([10.124.125.2]) by smtp-border-fw-out-2101.iad2.amazon.com with ESMTP; 26 Sep 2019 09:49:02 +0000 Received: from EX13MTAUWA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1e-17c49630.us-east-1.amazon.com (Postfix) with ESMTPS id 0FC15A2A42; Thu, 26 Sep 2019 09:49:02 +0000 (UTC) Received: from EX13d09UWA004.ant.amazon.com (10.43.160.158) by EX13MTAUWA001.ant.amazon.com (10.43.160.58) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:35 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13d09UWA004.ant.amazon.com (10.43.160.158) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:34 +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:33 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:18 +0100 Message-ID: <872c9d77a7ada6183a23c0e776d0975d07da873e.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 55/84] x86: switch to use domheap page for page tables 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 , Wei Liu , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_?= =?utf-8?q?Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Wei Liu Modify all the _new APIs to handle domheap pages. Signed-off-by: Wei Liu --- xen/arch/x86/mm.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d594b61702..8e33c8f4fe 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4854,10 +4854,10 @@ mfn_t alloc_xen_pagetable_new(void) { if ( system_state != SYS_STATE_early_boot ) { - void *ptr = alloc_xenheap_page(); + struct page_info *pg = alloc_domheap_page(NULL, 0); - BUG_ON(!hardware_domain && !ptr); - return virt_to_mfn(ptr); + BUG_ON(!hardware_domain && !pg); + return pg ? page_to_mfn(pg) : INVALID_MFN; } return alloc_boot_pages(1, 1); @@ -4865,20 +4865,21 @@ mfn_t alloc_xen_pagetable_new(void) void *map_xen_pagetable_new(mfn_t mfn) { - return mfn_to_virt(mfn_x(mfn)); + return map_domain_page(mfn); } /* v can point to an entry within a table or be NULL */ void unmap_xen_pagetable_new(void *v) { - /* XXX still using xenheap page, no need to do anything. */ + if ( v ) + unmap_domain_page((const void *)((unsigned long)v & PAGE_MASK)); } /* mfn can be INVALID_MFN */ void free_xen_pagetable_new(mfn_t mfn) { if ( system_state != SYS_STATE_early_boot && !mfn_eq(mfn, INVALID_MFN) ) - free_xenheap_page(mfn_to_virt(mfn_x(mfn))); + free_domheap_page(mfn_to_page(mfn)); } static DEFINE_SPINLOCK(map_pgdir_lock);