From patchwork Mon Sep 30 10:33: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: 11166415 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 B1F0913BD for ; Mon, 30 Sep 2019 10:36:02 +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 8DFCB20679 for ; Mon, 30 Sep 2019 10:36:02 +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="cikTGFjj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8DFCB20679 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 1iEt0y-0007IZ-1c; Mon, 30 Sep 2019 10:34:48 +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 1iEt0w-0007HR-Se for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:34:46 +0000 X-Inumbo-ID: ec37fe32-e36d-11e9-96cd-12813bfff9fa Received: from smtp-fw-2101.amazon.com (unknown [72.21.196.25]) by localhost (Halon) with ESMTPS id ec37fe32-e36d-11e9-96cd-12813bfff9fa; Mon, 30 Sep 2019 10:34:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839686; x=1601375686; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=Ip5SaJrZGdwG5/dssfQ+/hlVPjGGAQ5ZKNoKItEsnHE=; b=cikTGFjjzHjNL2vxUe2c62/eP5QuIPi8PpuGHBcNQHvX65P6sLmQhK8H EOfK/ao5nkZtiMehhF7WFAWoZeYWF3EJOvpynYd3rEBNF3gfrpuB1H4Li PS3vd1/fvE4QWpNQi3MVHWbE+UJdLhnNuVBVg/EMSxH/++VrjMJYm8TRd 0=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="754242231" Received: from iad6-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-1e-27fb8269.us-east-1.amazon.com) ([10.124.125.2]) by smtp-border-fw-out-2101.iad2.amazon.com with ESMTP; 30 Sep 2019 10:34:46 +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-27fb8269.us-east-1.amazon.com (Postfix) with ESMTPS id EC7FBA065D; Mon, 30 Sep 2019 10:34:44 +0000 (UTC) Received: from EX13D18UEE004.ant.amazon.com (10.43.62.129) 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:16 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D18UEE004.ant.amazon.com (10.43.62.129) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:15 +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:15 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:18 +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 26/55] x86_64/mm: switch to new APIs in setup_m2p_table 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 Signed-off-by: Wei Liu --- xen/arch/x86/x86_64/mm.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index f31bd4ffde..d452ed3966 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -397,9 +397,10 @@ static int setup_m2p_table(struct mem_hotadd_info *info) { unsigned long i, va, smap, emap; unsigned int n; - l2_pgentry_t *pl2e = NULL, *l2_ro_mpt; + l2_pgentry_t *pl2e = NULL, *l2_ro_mpt = NULL; l3_pgentry_t *l3_ro_mpt = NULL; int ret = 0; + mfn_t l2_ro_mpt_mfn; ASSERT(l4e_get_flags(idle_pg_table[l4_table_offset(RO_MPT_VIRT_START)]) & _PAGE_PRESENT); @@ -462,17 +463,19 @@ static int setup_m2p_table(struct mem_hotadd_info *info) l2_table_offset(va); else { - l2_ro_mpt = alloc_xen_pagetable(); - if ( !l2_ro_mpt ) + UNMAP_XEN_PAGETABLE_NEW(l2_ro_mpt); + l2_ro_mpt_mfn = alloc_xen_pagetable_new(); + if ( mfn_eq(l2_ro_mpt_mfn, INVALID_MFN) ) { ret = -ENOMEM; goto error; } + l2_ro_mpt = map_xen_pagetable_new(l2_ro_mpt_mfn); clear_page(l2_ro_mpt); l3e_write(&l3_ro_mpt[l3_table_offset(va)], - l3e_from_paddr(__pa(l2_ro_mpt), - __PAGE_HYPERVISOR_RO | _PAGE_USER)); + l3e_from_mfn(l2_ro_mpt_mfn, + __PAGE_HYPERVISOR_RO | _PAGE_USER)); pl2e = l2_ro_mpt; pl2e += l2_table_offset(va); } @@ -488,6 +491,7 @@ static int setup_m2p_table(struct mem_hotadd_info *info) ret = setup_compat_m2p_table(info); error: + UNMAP_XEN_PAGETABLE_NEW(l2_ro_mpt); return ret; }