From patchwork Thu Sep 26 09:46:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162143 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 EEA6B13BD for ; Thu, 26 Sep 2019 09:50:26 +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 CA243222C4 for ; Thu, 26 Sep 2019 09:50:26 +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="fghuVl+r" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA243222C4 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 1iDQP4-0006bj-Gu; Thu, 26 Sep 2019 09:49:38 +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 1iDQP1-0006W3-Rh for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:49:35 +0000 X-Inumbo-ID: db477203-e042-11e9-964c-12813bfff9fa Received: from smtp-fw-6002.amazon.com (unknown [52.95.49.90]) by localhost (Halon) with ESMTPS id db477203-e042-11e9-964c-12813bfff9fa; Thu, 26 Sep 2019 09:48:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491337; x=1601027337; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=f3D8sT4nLjfsYF+QuArXbr8SObtyun4SFrgHXutwP0A=; b=fghuVl+rtwyFFW84VkmtvF5pM52okdWq3XcbA0+B58Qw04i+tvQ97iFe XSC63MjVHYXXjEZdGRB50TzIQCPMfEro6Goy6RzXRl8T9QNNq8ojeq9FZ HDj0TVMaFTVHTbXLlBbmXeJmmWjAUUDUcTB0y4PtteOofxLvGPv582NPQ A=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="423750615" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1a-7d76a15f.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6002.iad6.amazon.com with ESMTP; 26 Sep 2019 09:48:56 +0000 Received: from EX13MTAUWA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1a-7d76a15f.us-east-1.amazon.com (Postfix) with ESMTPS id 8A07DA2991; Thu, 26 Sep 2019 09:48:56 +0000 (UTC) Received: from EX13D10UWA004.ant.amazon.com (10.43.160.64) by EX13MTAUWA001.ant.amazon.com (10.43.160.58) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:27 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D10UWA004.ant.amazon.com (10.43.160.64) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:26 +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:25 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:14 +0100 Message-ID: <144c16e0cb37d5fde3eb48b2eaad1bbd7022108f.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 51/84] x86/pv: properly map and unmap page tables in mark_pv_pt_pages_rdonly 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/pv/dom0_build.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index 1bd53e9c08..d7d42568fb 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -50,17 +50,17 @@ static __init void mark_pv_pt_pages_rdonly(struct domain *d, unsigned long count; struct page_info *page; l4_pgentry_t *pl4e; - l3_pgentry_t *pl3e; - l2_pgentry_t *pl2e; - l1_pgentry_t *pl1e; + l3_pgentry_t *pl3e, *l3t; + l2_pgentry_t *pl2e, *l2t; + l1_pgentry_t *pl1e, *l1t; pl4e = l4start + l4_table_offset(vpt_start); - pl3e = l4e_to_l3e(*pl4e); - pl3e += l3_table_offset(vpt_start); - pl2e = l3e_to_l2e(*pl3e); - pl2e += l2_table_offset(vpt_start); - pl1e = l2e_to_l1e(*pl2e); - pl1e += l1_table_offset(vpt_start); + l3t = map_xen_pagetable_new(l4e_get_mfn(*pl4e)); + pl3e = l3t + l3_table_offset(vpt_start); + l2t = map_xen_pagetable_new(l3e_get_mfn(*pl3e)); + pl2e = l2t + l2_table_offset(vpt_start); + l1t = map_xen_pagetable_new(l2e_get_mfn(*pl2e)); + pl1e = l1t + l1_table_offset(vpt_start); for ( count = 0; count < nr_pt_pages; count++ ) { l1e_remove_flags(*pl1e, _PAGE_RW); @@ -85,12 +85,23 @@ static __init void mark_pv_pt_pages_rdonly(struct domain *d, if ( !((unsigned long)++pl2e & (PAGE_SIZE - 1)) ) { if ( !((unsigned long)++pl3e & (PAGE_SIZE - 1)) ) - pl3e = l4e_to_l3e(*++pl4e); - pl2e = l3e_to_l2e(*pl3e); + { + UNMAP_XEN_PAGETABLE_NEW(l3t); + l3t = map_xen_pagetable_new(l4e_get_mfn(*++pl4e)); + pl3e = l3t; + } + UNMAP_XEN_PAGETABLE_NEW(l2t); + l2t = map_xen_pagetable_new(l3e_get_mfn(*pl3e)); + pl2e = l2t; } - pl1e = l2e_to_l1e(*pl2e); + UNMAP_XEN_PAGETABLE_NEW(l1t); + l1t = map_xen_pagetable_new(l2e_get_mfn(*pl2e)); + pl1e = l1t; } } + UNMAP_XEN_PAGETABLE_NEW(l1t); + UNMAP_XEN_PAGETABLE_NEW(l2t); + UNMAP_XEN_PAGETABLE_NEW(l3t); } static __init void setup_pv_physmap(struct domain *d, unsigned long pgtbl_pfn,