From patchwork Mon Sep 30 10:33:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166435 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 607AC13BD for ; Mon, 30 Sep 2019 10:36:30 +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 3C5B920679 for ; Mon, 30 Sep 2019 10:36:30 +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="UdKy0Kte" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C5B920679 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 1iEt1Q-0007vv-07; Mon, 30 Sep 2019 10:35:16 +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 1iEt1O-0007uK-Ut for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:35:14 +0000 X-Inumbo-ID: efd5ff08-e36d-11e9-96cd-12813bfff9fa Received: from smtp-fw-2101.amazon.com (unknown [72.21.196.25]) by localhost (Halon) with ESMTPS id efd5ff08-e36d-11e9-96cd-12813bfff9fa; Mon, 30 Sep 2019 10:34:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839692; x=1601375692; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=gu2E4m0AtO6nGVE9CH0eP7a1+B0fb6VtXGPXw6YGSZQ=; b=UdKy0KteZY1KABYAnNw5KDIEjzRdxT9WMakgvMECowII2nbCtfTRdOrK PYdM9Rp0UftZ0NwZ9nfzsAJqTGQPZshw3Txwvyh9izKQ2Or5JJZmS4Xcv hVwkj0LnV5PsMCwDht/6pBP+gC+Pu51iDqLZkqI6js1q1mrp8AeRaBN8+ 8=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="754242266" Received: from iad6-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-1d-37fd6b3d.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:52 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1d-37fd6b3d.us-east-1.amazon.com (Postfix) with ESMTPS id 3F7A5282413; Mon, 30 Sep 2019 10:34:52 +0000 (UTC) Received: from EX13D20UEE003.ant.amazon.com (10.43.62.146) 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:25 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D20UEE003.ant.amazon.com (10.43.62.146) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:25 +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:24 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:29 +0100 Message-ID: <2cbd893129d3d74c927d8ce17082ed331f655af6.1569833766.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] [PATCH v2 37/55] x86/smpboot: switch pl1e to use new APIs in clone_mapping 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/smpboot.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index d327c062b1..956e1bdbcc 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -666,7 +666,7 @@ static int clone_mapping(const void *ptr, root_pgentry_t *rpt) unsigned int flags; l3_pgentry_t *pl3e = NULL; l2_pgentry_t *pl2e = NULL; - l1_pgentry_t *pl1e; + l1_pgentry_t *pl1e = NULL; int rc; /* @@ -713,7 +713,8 @@ static int clone_mapping(const void *ptr, root_pgentry_t *rpt) } else { - pl1e = l2e_to_l1e(*pl2e) + l1_table_offset(linear); + pl1e = map_xen_pagetable_new(l2e_get_mfn(*pl2e)); + pl1e += l1_table_offset(linear); flags = l1e_get_flags(*pl1e); if ( !(flags & _PAGE_PRESENT) ) { @@ -724,6 +725,7 @@ static int clone_mapping(const void *ptr, root_pgentry_t *rpt) } } + UNMAP_XEN_PAGETABLE_NEW(pl1e); UNMAP_XEN_PAGETABLE_NEW(pl2e); UNMAP_XEN_PAGETABLE_NEW(pl3e); @@ -772,19 +774,22 @@ static int clone_mapping(const void *ptr, root_pgentry_t *rpt) if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) { - pl1e = alloc_xen_pagetable(); - if ( !pl1e ) + mfn_t l1t_mfn = alloc_xen_pagetable_new(); + + if ( mfn_eq(l1t_mfn, INVALID_MFN) ) { rc = -ENOMEM; goto out; } + + pl1e = map_xen_pagetable_new(l1t_mfn); clear_page(pl1e); - l2e_write(pl2e, l2e_from_paddr(__pa(pl1e), __PAGE_HYPERVISOR)); + l2e_write(pl2e, l2e_from_mfn(l1t_mfn, __PAGE_HYPERVISOR)); } else { ASSERT(!(l2e_get_flags(*pl2e) & _PAGE_PSE)); - pl1e = l2e_to_l1e(*pl2e); + pl1e = map_xen_pagetable_new(l2e_get_mfn(*pl2e)); } pl1e += l1_table_offset(linear); @@ -800,6 +805,7 @@ static int clone_mapping(const void *ptr, root_pgentry_t *rpt) rc = 0; out: + UNMAP_XEN_PAGETABLE_NEW(pl1e); UNMAP_XEN_PAGETABLE_NEW(pl2e); UNMAP_XEN_PAGETABLE_NEW(pl3e); return rc;