From patchwork Mon Sep 30 10:33:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166479 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 CCF8213BD for ; Mon, 30 Sep 2019 10:37: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 A9A1620679 for ; Mon, 30 Sep 2019 10:37: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="FEOCfsTh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A9A1620679 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 1iEt2n-00026D-EQ; Mon, 30 Sep 2019 10:36:41 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEt2l-000214-1d for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:36:39 +0000 X-Inumbo-ID: 1e1bb4de-e36e-11e9-97fb-bc764e2007e4 Received: from smtp-fw-33001.amazon.com (unknown [207.171.190.10]) by localhost (Halon) with ESMTPS id 1e1bb4de-e36e-11e9-97fb-bc764e2007e4; Mon, 30 Sep 2019 10:36:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839770; x=1601375770; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=f3D8sT4nLjfsYF+QuArXbr8SObtyun4SFrgHXutwP0A=; b=FEOCfsThBDdxK7Wym0andzGz1dmg+GdRONIn3NavwUHcmdRx6Hoq6CHd J/kM6R1s3KXXhn/Fy+4vtxykCCOVrhHtxR7lxhiPyoPIT58dE81T0AVOt sJuMseItxreCJClsUjV1PQt2wE0XBWJx4ypmHsWyssfTjBB21zIY5E7/i c=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="838005692" Received: from sea3-co-svc-lb6-vlan2.sea.amazon.com (HELO email-inbound-relay-1e-62350142.us-east-1.amazon.com) ([10.47.22.34]) by smtp-border-fw-out-33001.sea14.amazon.com with ESMTP; 30 Sep 2019 10:35:10 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1e-62350142.us-east-1.amazon.com (Postfix) with ESMTPS id 6C0DEA00F1; Mon, 30 Sep 2019 10:34:58 +0000 (UTC) Received: from EX13D12UEE001.ant.amazon.com (10.43.62.147) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:37 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D12UEE001.ant.amazon.com (10.43.62.147) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:37 +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:36 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:42 +0100 Message-ID: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [PATCH v2 50/55] 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 , 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/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,