From patchwork Thu Sep 26 09:46:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162083 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 706E11709 for ; Thu, 26 Sep 2019 09:49:24 +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 4D014222C0 for ; Thu, 26 Sep 2019 09:49:24 +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="R6nypKWm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D014222C0 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 1iDQO4-0004k9-1V; Thu, 26 Sep 2019 09:48:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDQO2-0004i7-P3 for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:48:34 +0000 X-Inumbo-ID: cb99bbc6-e042-11e9-b588-bc764e2007e4 Received: from smtp-fw-4101.amazon.com (unknown [72.21.198.25]) by localhost (Halon) with ESMTPS id cb99bbc6-e042-11e9-b588-bc764e2007e4; Thu, 26 Sep 2019 09:48:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491309; x=1601027309; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=XhYOIXufiZD9zZ7TLNj+y8Go4KtY9z8YI6yVoMYhfI8=; b=R6nypKWmFX3Uj4P+IpMNlDjN3Ap2HmwOUw1cKOYCiHbVAvZq62Vmh8nL 6PiGhgOnT1dcaOMhV8dzH8p8Jw2cCdSBAoq8Fe89cdMjdvZPvKmBPUtf7 3n3zh13WjFYhmg8KE5hjl3ruJ5N4h52G+7hx7fQcsQt6KwUw1UONVrOvR 8=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="787535127" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1d-2c665b5d.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-4101.iad4.amazon.com with ESMTP; 26 Sep 2019 09:48:29 +0000 Received: from EX13MTAUWA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1d-2c665b5d.us-east-1.amazon.com (Postfix) with ESMTPS id CF372A25D2; Thu, 26 Sep 2019 09:48:27 +0000 (UTC) Received: from EX13D27UWA002.ant.amazon.com (10.43.160.30) by EX13MTAUWA001.ant.amazon.com (10.43.160.118) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:03 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D27UWA002.ant.amazon.com (10.43.160.30) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:02 +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:01 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:01 +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 38/84] 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 , 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 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 d3651fb99a..daf734d095 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -668,7 +668,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; /* @@ -715,7 +715,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) ) { @@ -726,6 +727,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); @@ -774,19 +776,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); @@ -802,6 +807,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;