From patchwork Mon Mar 23 09:41:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongyan Xia X-Patchwork-Id: 11452563 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 63FDE139A for ; Mon, 23 Mar 2020 09:42:57 +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 3F9AF206F8 for ; Mon, 23 Mar 2020 09:42:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=xen.org header.i=@xen.org header.b="Hcr9YcN2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F9AF206F8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=pass 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 1jGJas-0004JM-Fr; Mon, 23 Mar 2020 09:42:02 +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 1jGJaq-0004IZ-VH for xen-devel@lists.xenproject.org; Mon, 23 Mar 2020 09:42:00 +0000 X-Inumbo-ID: 89d5fe5e-6cea-11ea-8292-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 89d5fe5e-6cea-11ea-8292-12813bfff9fa; Mon, 23 Mar 2020 09:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Op5RGEgTJYxinE1ReyG8HNPBZtOGMQ5zAHn/J1yOVxw=; b=Hcr9YcN2vHhvzpFR1m6ije9uQN 8M6D2Q36j7iUm6F3tnFM34Uzoz3bR1aVPmz8kGg9giBjLU1RFcKYtWTWxdrBOnQoNcBYdn6suxDQ8 qy5sODnVBS4n01z0ZegvG08CADEO+RBllFeKjKhZUBFXqnh1fANZdpDgsxeFjHvDsY+0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGJan-00006Z-JH; Mon, 23 Mar 2020 09:41:57 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=u1bbd043a57dd5a.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1jGJan-00041e-9M; Mon, 23 Mar 2020 09:41:57 +0000 From: Hongyan Xia To: xen-devel@lists.xenproject.org Date: Mon, 23 Mar 2020 09:41:39 +0000 Message-Id: <9b46a0bae03107fcb192e6590234b9e882965f11.1584955616.git.hongyxia@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Subject: [Xen-devel] [PATCH 2/5] x86_64/mm: map and unmap page tables in m2p_mapped X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list 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?= MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Wei Liu Signed-off-by: Wei Liu Reviewed-by: Hongyan Xia --- xen/arch/x86/x86_64/mm.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index b7ce833ffc..a440dac25e 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -131,27 +131,33 @@ static int m2p_mapped(unsigned long spfn) unsigned long va; l3_pgentry_t *l3_ro_mpt; l2_pgentry_t *l2_ro_mpt; + int rc = M2P_NO_MAPPED; va = RO_MPT_VIRT_START + spfn * sizeof(*machine_to_phys_mapping); - l3_ro_mpt = l4e_to_l3e(idle_pg_table[l4_table_offset(va)]); + l3_ro_mpt = map_l3t_from_l4e(idle_pg_table[l4_table_offset(va)]); switch ( l3e_get_flags(l3_ro_mpt[l3_table_offset(va)]) & (_PAGE_PRESENT |_PAGE_PSE)) { case _PAGE_PSE|_PAGE_PRESENT: - return M2P_1G_MAPPED; + rc = M2P_1G_MAPPED; + goto out; /* Check for next level */ case _PAGE_PRESENT: break; default: - return M2P_NO_MAPPED; + rc = M2P_NO_MAPPED; + goto out; } - l2_ro_mpt = l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]); + l2_ro_mpt = map_l2t_from_l3e(l3_ro_mpt[l3_table_offset(va)]); if (l2e_get_flags(l2_ro_mpt[l2_table_offset(va)]) & _PAGE_PRESENT) - return M2P_2M_MAPPED; + rc = M2P_2M_MAPPED; + UNMAP_DOMAIN_PAGE(l2_ro_mpt); - return M2P_NO_MAPPED; + out: + UNMAP_DOMAIN_PAGE(l3_ro_mpt); + return rc; } static int share_hotadd_m2p_table(struct mem_hotadd_info *info)