From patchwork Thu Sep 26 09:45:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162099 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 EE2C613BD for ; Thu, 26 Sep 2019 09:49:51 +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 C9544222C0 for ; Thu, 26 Sep 2019 09:49:51 +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="G6wiJEl2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9544222C0 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 1iDQO5-0004oS-VS; Thu, 26 Sep 2019 09:48:37 +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 1iDQO3-0004jX-O5 for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:48:35 +0000 X-Inumbo-ID: c7c32be1-e042-11e9-964c-12813bfff9fa Received: from smtp-fw-6001.amazon.com (unknown [52.95.48.154]) by localhost (Halon) with ESMTPS id c7c32be1-e042-11e9-964c-12813bfff9fa; Thu, 26 Sep 2019 09:48:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491303; x=1601027303; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=9WigQ+PC2MhUNlwYiu/8I0IxPqzWO1pANTCorurPBOE=; b=G6wiJEl2UzbjOKCWl+hdBYo3kbtrVGlyPYGEeNo6BdINAEfIUwStIQ6q H38ChkMGztp0nCQqRTZJ4rEiazb14aiqcPZU2nI6d6WKe112RFflKGK0G gltnvQXm/enklp1VDSLn7b6P8zNXmn7kzB1u7Of0lmF79T29RQdsFpsSg I=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="417788203" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1d-f273de60.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6001.iad6.amazon.com with ESMTP; 26 Sep 2019 09:48:23 +0000 Received: from EX13MTAUWA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1d-f273de60.us-east-1.amazon.com (Postfix) with ESMTPS id 6EEAAA2229; Thu, 26 Sep 2019 09:48:21 +0000 (UTC) Received: from EX13D18UWA002.ant.amazon.com (10.43.160.199) by EX13MTAUWA001.ant.amazon.com (10.43.160.58) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:47:59 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D18UWA002.ant.amazon.com (10.43.160.199) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:47:58 +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:47:57 +0000 From: To: Date: Thu, 26 Sep 2019 10:45:59 +0100 Message-ID: <0f1379a676f2cd6676b950bdae66b9a81df34fe0.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 36/84] x86/smpboot: switch pl3e 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 | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 8bee0c41e3..f970b1bd69 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 long linear = (unsigned long)ptr, pfn; unsigned int flags; - l3_pgentry_t *pl3e; + l3_pgentry_t *pl3e = NULL; l2_pgentry_t *pl2e; l1_pgentry_t *pl1e; int rc; @@ -689,8 +689,9 @@ static int clone_mapping(const void *ptr, root_pgentry_t *rpt) goto out; } - pl3e = l4e_to_l3e(idle_pg_table[root_table_offset(linear)]) + - l3_table_offset(linear); + pl3e = map_xen_pagetable_new( + l4e_get_mfn(idle_pg_table[root_table_offset(linear)])); + pl3e += l3_table_offset(linear); flags = l3e_get_flags(*pl3e); ASSERT(flags & _PAGE_PRESENT); @@ -724,20 +725,26 @@ static int clone_mapping(const void *ptr, root_pgentry_t *rpt) } } + UNMAP_XEN_PAGETABLE_NEW(pl3e); + if ( !(root_get_flags(rpt[root_table_offset(linear)]) & _PAGE_PRESENT) ) { - pl3e = alloc_xen_pagetable(); - if ( !pl3e ) + mfn_t l3t_mfn = alloc_xen_pagetable_new(); + + if ( mfn_eq(l3t_mfn, INVALID_MFN) ) { rc = -ENOMEM; goto out; } + + pl3e = map_xen_pagetable_new(l3t_mfn); clear_page(pl3e); l4e_write(&rpt[root_table_offset(linear)], - l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR)); + l4e_from_mfn(l3t_mfn, __PAGE_HYPERVISOR)); } else - pl3e = l4e_to_l3e(rpt[root_table_offset(linear)]); + pl3e = map_xen_pagetable_new( + l4e_get_mfn(rpt[root_table_offset(linear)])); pl3e += l3_table_offset(linear); @@ -790,6 +797,7 @@ static int clone_mapping(const void *ptr, root_pgentry_t *rpt) rc = 0; out: + UNMAP_XEN_PAGETABLE_NEW(pl3e); return rc; }