From patchwork Mon Sep 30 10:33:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166417 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 11BC213BD for ; Mon, 30 Sep 2019 10:36:09 +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 E100C20679 for ; Mon, 30 Sep 2019 10:36:08 +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="KlMP5k+M" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E100C20679 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 1iEt1U-00083c-Hb; Mon, 30 Sep 2019 10:35:20 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEt1S-00081A-RV for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:35:18 +0000 X-Inumbo-ID: f1d3176e-e36d-11e9-bf31-bc764e2007e4 Received: from smtp-fw-6002.amazon.com (unknown [52.95.49.90]) by localhost (Halon) with ESMTPS id f1d3176e-e36d-11e9-bf31-bc764e2007e4; Mon, 30 Sep 2019 10:34:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839695; x=1601375695; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=P0cwxGL9Za3ub4ggzM1FvUu37oEFscV2CGp82CE/u8M=; b=KlMP5k+ML/R6FGwwVeRvgzUlK3ewkV2CPKI3VyqCp1EvHNgZdw5EAzVG 7W5G142tAXqe3RZVedIHu3py1x70hoPBzt4TtvTjuXTbn02bk31EJmwdR zHCHjTYNTxdymqnC/tMQZHhGrB55eByuz49WKjq8UBO7tAzttPzb4U9Ut 4=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="424630151" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1d-98acfc19.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6002.iad6.amazon.com with ESMTP; 30 Sep 2019 10:34:52 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1d-98acfc19.us-east-1.amazon.com (Postfix) with ESMTPS id 2F2CDA1DD8; Mon, 30 Sep 2019 10:34:51 +0000 (UTC) Received: from EX13D15UEE001.ant.amazon.com (10.43.62.86) by EX13MTAUEA001.ant.amazon.com (10.43.61.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:23 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D15UEE001.ant.amazon.com (10.43.62.86) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:23 +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:22 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:27 +0100 Message-ID: <7133eb6c9eb2800c8bc69e9aed279466e1369489.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 35/55] 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 , 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 | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 716dc1512d..db39f5cbb2 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -664,7 +664,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; @@ -687,8 +687,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); @@ -722,20 +723,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); @@ -788,6 +795,7 @@ static int clone_mapping(const void *ptr, root_pgentry_t *rpt) rc = 0; out: + UNMAP_XEN_PAGETABLE_NEW(pl3e); return rc; }