From patchwork Mon Sep 30 10:33:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166389 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 624D51709 for ; Mon, 30 Sep 2019 10:35:40 +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 3EEB9216F4 for ; Mon, 30 Sep 2019 10:35:40 +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="IrQVl+DT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3EEB9216F4 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 1iEt0Y-0006wI-2l; Mon, 30 Sep 2019 10:34:22 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEt0W-0006vD-Lq for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:34:20 +0000 X-Inumbo-ID: dc96e920-e36d-11e9-97fb-bc764e2007e4 Received: from smtp-fw-4101.amazon.com (unknown [72.21.198.25]) by localhost (Halon) with ESMTPS id dc96e920-e36d-11e9-97fb-bc764e2007e4; Mon, 30 Sep 2019 10:34:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839660; x=1601375660; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=IWvv3JFE8UC9wDGna0qJ6XB0bPktobco6eb0qHMgbxc=; b=IrQVl+DTgEJdw5ChYs097OsLACS7H6qlhPjSHpC+ZX7+elNXoUPb37fp LGg1dvzhdtCv7g9gHVaQI+tqQ/oU1BidlG1y5sz2ewWaqNM5XcDyjah5x w20nVcbnvyYB41G3GJHTQ/8AMVKFiVgIlF16tXV4NC2Hj5oGDfuZdC/G+ s=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="788414639" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1a-e34f1ddc.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-4101.iad4.amazon.com with ESMTP; 30 Sep 2019 10:34:20 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1a-e34f1ddc.us-east-1.amazon.com (Postfix) with ESMTPS id C059FA2161; Mon, 30 Sep 2019 10:34:18 +0000 (UTC) Received: from EX13D20UEE002.ant.amazon.com (10.43.62.204) 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:02 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D20UEE002.ant.amazon.com (10.43.62.204) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:33:59 +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:33:58 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:03 +0100 Message-ID: <596e44b9d83551de8982ac9a20a47d4bbce32844.1569833766.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] [PATCH v2 11/55] x86/mm: change pl1e to l1t in virt_to_xen_l1e 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 We will need to have a variable named pl1e when we rewrite virt_to_xen_l1e. Change pl1e to l1t to reflect better its purpose. This will make reviewing later patch easier. No functional change. Signed-off-by: Wei Liu --- xen/arch/x86/mm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index ea6931e052..7a522d90fe 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4972,22 +4972,22 @@ l1_pgentry_t *virt_to_xen_l1e(unsigned long v) if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) { bool locking = system_state > SYS_STATE_boot; - l1_pgentry_t *pl1e = alloc_xen_pagetable(); + l1_pgentry_t *l1t = alloc_xen_pagetable(); - if ( !pl1e ) + if ( !l1t ) return NULL; if ( locking ) spin_lock(&map_pgdir_lock); if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) { - clear_page(pl1e); - l2e_write(pl2e, l2e_from_paddr(__pa(pl1e), __PAGE_HYPERVISOR)); - pl1e = NULL; + clear_page(l1t); + l2e_write(pl2e, l2e_from_paddr(__pa(l1t), __PAGE_HYPERVISOR)); + l1t = NULL; } if ( locking ) spin_unlock(&map_pgdir_lock); - if ( pl1e ) - free_xen_pagetable(pl1e); + if ( l1t ) + free_xen_pagetable(l1t); } BUG_ON(l2e_get_flags(*pl2e) & _PAGE_PSE);