From patchwork Wed Apr 8 13:36:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongyan Xia X-Patchwork-Id: 11480133 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 5A72B912 for ; Wed, 8 Apr 2020 13:38:54 +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 371D220747 for ; Wed, 8 Apr 2020 13:38:54 +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="Y+JTz/pM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 371D220747 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 1jMAtH-0007Z5-UB; Wed, 08 Apr 2020 13:37:15 +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 1jMAtG-0007Yh-RP for xen-devel@lists.xenproject.org; Wed, 08 Apr 2020 13:37:14 +0000 X-Inumbo-ID: 0ad08a5b-799e-11ea-81eb-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0ad08a5b-799e-11ea-81eb-12813bfff9fa; Wed, 08 Apr 2020 13:37:09 +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=+zFaUj7bu8w84ctYQkaYIoA6o69FZPkcrEvCQXkz0lM=; b=Y+JTz/pMmTycAmcsfr7cfN7XPO +rXB2rfXPGUQKdoHhd/+GNTecVhz1eVrBj+iS7YcVGRRUnyXDh7IknmC3nhqgSp9bHm1W8qimR9JT 5uI+TZOACxCUs3cRG0JMxxln5Yl99LbITO2oEPri/MYfjag7nC6NZHHy0j3u/XYetsg0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jMAtB-00057k-Ba; Wed, 08 Apr 2020 13:37:09 +0000 Received: from 54-240-197-233.amazon.com ([54.240.197.233] 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 1jMAtB-0005ee-1u; Wed, 08 Apr 2020 13:37:09 +0000 From: Hongyan Xia To: xen-devel@lists.xenproject.org Subject: [PATCH v2 2/5] x86_64/mm: map and unmap page tables in m2p_mapped Date: Wed, 8 Apr 2020 14:36:52 +0100 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: 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 , julien@xen.org, 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 Signed-off-by: Hongyan Xia Reviewed-by: Jan Beulich --- Changed in v2: - avoid adding goto labels, simply get the PTE and unmap quickly. - code style fixes. --- xen/arch/x86/x86_64/mm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index cee836ec37..8e0caa7327 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -129,14 +129,14 @@ static mfn_t alloc_hotadd_mfn(struct mem_hotadd_info *info) static int m2p_mapped(unsigned long spfn) { unsigned long va; - l3_pgentry_t *l3_ro_mpt; - l2_pgentry_t *l2_ro_mpt; + l3_pgentry_t l3e_ro_mpt; + l2_pgentry_t l2e_ro_mpt; va = RO_MPT_VIRT_START + spfn * sizeof(*machine_to_phys_mapping); - l3_ro_mpt = l4e_to_l3e(idle_pg_table[l4_table_offset(va)]); + l3e_ro_mpt = l3e_from_l4e(idle_pg_table[l4_table_offset(va)], + l3_table_offset(va)); - switch ( l3e_get_flags(l3_ro_mpt[l3_table_offset(va)]) & - (_PAGE_PRESENT |_PAGE_PSE)) + switch ( l3e_get_flags(l3e_ro_mpt) & (_PAGE_PRESENT | _PAGE_PSE) ) { case _PAGE_PSE|_PAGE_PRESENT: return M2P_1G_MAPPED; @@ -146,9 +146,9 @@ static int m2p_mapped(unsigned long spfn) default: return M2P_NO_MAPPED; } - l2_ro_mpt = l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]); + l2e_ro_mpt = l2e_from_l3e(l3e_ro_mpt, l2_table_offset(va)); - if (l2e_get_flags(l2_ro_mpt[l2_table_offset(va)]) & _PAGE_PRESENT) + if ( l2e_get_flags(l2e_ro_mpt) & _PAGE_PRESENT ) return M2P_2M_MAPPED; return M2P_NO_MAPPED;