From patchwork Thu Sep 26 09:45:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162071 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 3AB241709 for ; Thu, 26 Sep 2019 09:49:14 +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 17243222C0 for ; Thu, 26 Sep 2019 09:49:14 +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="Jj/r/P3a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 17243222C0 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 1iDQNR-0003tL-VL; Thu, 26 Sep 2019 09:47:57 +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 1iDQNP-0003qn-Ow for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:47:55 +0000 X-Inumbo-ID: b5ac42df-e042-11e9-964c-12813bfff9fa Received: from smtp-fw-6001.amazon.com (unknown [52.95.48.154]) by localhost (Halon) with ESMTPS id b5ac42df-e042-11e9-964c-12813bfff9fa; Thu, 26 Sep 2019 09:47:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491273; x=1601027273; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=NzzwvERroAI+I7zkH8dvAghyc38Cq8FDW8eCIR3M3OY=; b=Jj/r/P3awWb7BtysKBUP7791LweCd85ru4U4DTxcoTjgg3KScVWUppND 5CjFj9dMM3UwSJ01fTA5PfMFL7sbxAdKa+lGymMSrdhQrGuzd4/a8uv39 L6bq+bCk7SUS1cI7IX8YZXaC//tMdAzJ8CkMeYASIYpWQ6u9RO7ANFZWc Q=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="417788121" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1e-c7c08562.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6001.iad6.amazon.com with ESMTP; 26 Sep 2019 09:47:53 +0000 Received: from EX13MTAUWA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1e-c7c08562.us-east-1.amazon.com (Postfix) with ESMTPS id 04F0824111A; Thu, 26 Sep 2019 09:47:52 +0000 (UTC) Received: from EX13D31UWA002.ant.amazon.com (10.43.160.82) by EX13MTAUWA001.ant.amazon.com (10.43.160.118) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:47:25 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D31UWA002.ant.amazon.com (10.43.160.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:47: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:47:23 +0000 From: To: Date: Thu, 26 Sep 2019 10:45:40 +0100 Message-ID: <754cbac796a3e4326e2ad6b103d85dbbc3f51ae2.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 17/84] xxx fixup: avoid shadowing mfn 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 --- xen/arch/x86/mm.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 0616666221..267e4ceef5 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5185,7 +5185,7 @@ int map_pages_to_xen( unsigned int flush_flags = FLUSH_TLB | FLUSH_ORDER(2 * PAGETABLE_ORDER); l2_pgentry_t *l2t; - mfn_t mfn; + mfn_t l2t_mfn; /* Skip this PTE if there is no change. */ if ( ((l3e_get_pfn(ol3e) & ~(L2_PAGETABLE_ENTRIES * @@ -5207,14 +5207,14 @@ int map_pages_to_xen( goto end_of_loop; } - mfn = alloc_xen_pagetable_new(); - if ( mfn_eq(mfn, INVALID_MFN) ) + l2t_mfn = alloc_xen_pagetable_new(); + if ( mfn_eq(l2t_mfn, INVALID_MFN) ) { ASSERT(rc == -ENOMEM); goto out; } - l2t = map_xen_pagetable_new(mfn); + l2t = map_xen_pagetable_new(l2t_mfn); for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++ ) l2e_write(l2t + i, @@ -5230,7 +5230,8 @@ int map_pages_to_xen( if ( (l3e_get_flags(*pl3e) & _PAGE_PRESENT) && (l3e_get_flags(*pl3e) & _PAGE_PSE) ) { - l3e_write_atomic(pl3e, l3e_from_mfn(mfn, __PAGE_HYPERVISOR)); + l3e_write_atomic(pl3e, + l3e_from_mfn(l2t_mfn, __PAGE_HYPERVISOR)); UNMAP_XEN_PAGETABLE_NEW(l2t); l2t = NULL; } @@ -5240,7 +5241,7 @@ int map_pages_to_xen( if ( l2t ) { UNMAP_XEN_PAGETABLE_NEW(l2t); - free_xen_pagetable_new(mfn); + free_xen_pagetable_new(l2t_mfn); } } @@ -5304,7 +5305,7 @@ int map_pages_to_xen( unsigned int flush_flags = FLUSH_TLB | FLUSH_ORDER(PAGETABLE_ORDER); l1_pgentry_t *l1t; - mfn_t mfn; + mfn_t l1t_mfn; /* Skip this PTE if there is no change. */ if ( (((l2e_get_pfn(*pl2e) & ~(L1_PAGETABLE_ENTRIES - 1)) + @@ -5324,14 +5325,14 @@ int map_pages_to_xen( goto check_l3; } - mfn = alloc_xen_pagetable_new(); - if ( mfn_eq(mfn, INVALID_MFN) ) + l1t_mfn = alloc_xen_pagetable_new(); + if ( mfn_eq(l1t_mfn, INVALID_MFN) ) { ASSERT(rc == -ENOMEM); goto out; } - l1t = map_xen_pagetable_new(mfn); + l1t = map_xen_pagetable_new(l1t_mfn); for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ ) l1e_write(&l1t[i], @@ -5346,7 +5347,7 @@ int map_pages_to_xen( if ( (l2e_get_flags(*pl2e) & _PAGE_PRESENT) && (l2e_get_flags(*pl2e) & _PAGE_PSE) ) { - l2e_write_atomic(pl2e, l2e_from_mfn(mfn, + l2e_write_atomic(pl2e, l2e_from_mfn(l1t_mfn, __PAGE_HYPERVISOR)); UNMAP_XEN_PAGETABLE_NEW(l1t); l1t = NULL; @@ -5357,7 +5358,7 @@ int map_pages_to_xen( if ( l1t ) { UNMAP_XEN_PAGETABLE_NEW(l1t); - free_xen_pagetable_new(mfn); + free_xen_pagetable_new(l1t_mfn); } }