From patchwork Mon Sep 30 10:33:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166457 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 4E56716B1 for ; Mon, 30 Sep 2019 10:36:49 +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 2AD80216F4 for ; Mon, 30 Sep 2019 10:36:49 +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="eUWerRXf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2AD80216F4 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 1iEt1n-0000AP-Kd; Mon, 30 Sep 2019 10:35:39 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEt1m-00008r-SL for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:35:38 +0000 X-Inumbo-ID: f538ab12-e36d-11e9-97fb-bc764e2007e4 Received: from smtp-fw-4101.amazon.com (unknown [72.21.198.25]) by localhost (Halon) with ESMTPS id f538ab12-e36d-11e9-97fb-bc764e2007e4; Mon, 30 Sep 2019 10:35:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839701; x=1601375701; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=nr+dk+LZcxtUkwKkvUL9TfVJ9eECRYdgkB1jYtP2PtI=; b=eUWerRXfKnr/vZrWfqP7ZmRxddKpPQTzkqTKxm8da8T60kaQbH/MjOrX 1ekCqIbUEWfeY2LetnF0iP7XzNM74svD2ABxLoWgxS8DbE994C1f4SRyE vSKOTKZXC21U1zw6CjF8edE3YaWawf0vwqsjCJv1Vjsr4sNcwwQpOMYzB s=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="788414753" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1e-17c49630.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-4101.iad4.amazon.com with ESMTP; 30 Sep 2019 10:35:01 +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-17c49630.us-east-1.amazon.com (Postfix) with ESMTPS id 1BFD5A229A; Mon, 30 Sep 2019 10:35:00 +0000 (UTC) Received: from EX13D18UEE003.ant.amazon.com (10.43.62.169) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:41 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D18UEE003.ant.amazon.com (10.43.62.169) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:40 +0000 Received: from u9d785c4ba99158.ant.amazon.com (10.125.106.78) by mail-relay.amazon.com (10.43.62.226) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Mon, 30 Sep 2019 10:34:39 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:46 +0100 Message-ID: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [PATCH v2 54/55] 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 , Jan Beulich , =?utf-8?q?Roger_Pau_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 c9be239d53..a2d2d01660 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);