From patchwork Thu Sep 26 09:46:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162181 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 216FD13BD for ; Thu, 26 Sep 2019 09:51:17 +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 EEB122053B for ; Thu, 26 Sep 2019 09:51:16 +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="AWEzgS8I" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EEB122053B 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 1iDQPs-0000GC-2X; Thu, 26 Sep 2019 09:50:28 +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 1iDQPp-00006R-Sr for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:50:25 +0000 X-Inumbo-ID: f84ce850-e042-11e9-964c-12813bfff9fa Received: from smtp-fw-2101.amazon.com (unknown [72.21.196.25]) by localhost (Halon) with ESMTPS id f84ce850-e042-11e9-964c-12813bfff9fa; Thu, 26 Sep 2019 09:49:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491384; x=1601027384; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=kyWBa7Itj+eCyTqGw+czzYikdfFYsEt5DZcfNy6zJ2Q=; b=AWEzgS8IDoTb4R98eM780ttDPfhcj38VkuHVtzKBPYo92B2F2zHotgLx aOEsok0lsrgVXhL22eB1XXMG03GvNZWbFMEfyP6qDNoGFQFDG//ptI13W WO5ZIvXidC01yg5x0J0XiIjfJgrvbJ3FBa0f/DJTh/DRwbmrSzqNgWgIw s=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="753354397" Received: from iad6-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-1a-821c648d.us-east-1.amazon.com) ([10.124.125.2]) by smtp-border-fw-out-2101.iad2.amazon.com with ESMTP; 26 Sep 2019 09:49:44 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1a-821c648d.us-east-1.amazon.com (Postfix) with ESMTPS id 537BFA236A; Thu, 26 Sep 2019 09:49:43 +0000 (UTC) Received: from EX13D28EUB001.ant.amazon.com (10.43.166.50) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:49:26 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D28EUB001.ant.amazon.com (10.43.166.50) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:49:25 +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:49:22 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:33 +0100 Message-ID: <42c22c45411e5953097478899c1f9c1b147f39f7.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 70/84] x86/smpboot: use xenheap pages for rpts in smpboot. 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 , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Wei Liu , Jan Beulich , Hongyan Xia Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Hongyan Xia This is because a lot of code assumes that the rpt is in the direct map region which is always mapped. Switching to domheap is non-trivial, so use xenheap for now, which means a bit less security. Signed-off-by: Hongyan Xia --- xen/arch/x86/smpboot.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 53f9173f37..7034c699d6 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -832,14 +832,20 @@ static int setup_cpu_root_pgt(unsigned int cpu) goto out; } - rpt_mfn = alloc_xen_pagetable(); - if ( mfn_eq(rpt_mfn, INVALID_MFN) ) + /* + * Unfortunately, some code (especially in assembly) assumes the rpt is in + * the DIRECTMAP region and is always mapped. Making all of them adapt to + * the new page table APIs is non-trivial. For now, make it always mapped + * on the xenheap. + */ + rpt = alloc_xenheap_page(); + if ( !rpt ) { rc = -ENOMEM; goto out; } - rpt = map_xen_pagetable(rpt_mfn); + rpt_mfn = _mfn(virt_to_mfn(rpt)); clear_page(rpt); per_cpu(root_pgt_mfn, cpu) = rpt_mfn; @@ -884,7 +890,6 @@ static int setup_cpu_root_pgt(unsigned int cpu) rc = clone_mapping((void *)per_cpu(stubs.addr, cpu), rpt); out: - UNMAP_XEN_PAGETABLE(rpt); return rc; } @@ -900,7 +905,7 @@ static void cleanup_cpu_root_pgt(unsigned int cpu) per_cpu(root_pgt_mfn, cpu) = INVALID_MFN; - rpt = map_xen_pagetable(rpt_mfn); + rpt = mfn_to_virt(mfn_x(rpt_mfn)); for ( r = root_table_offset(DIRECTMAP_VIRT_START); r < root_table_offset(HYPERVISOR_VIRT_END); ++r ) @@ -945,8 +950,8 @@ static void cleanup_cpu_root_pgt(unsigned int cpu) free_xen_pagetable(l3t_mfn); } - UNMAP_XEN_PAGETABLE(rpt); - free_xen_pagetable(rpt_mfn); + /* Unlike other levels, the root level is a xenheap page. */ + free_xenheap_page(rpt); /* Also zap the stub mapping for this CPU. */ if ( stub_linear )