From patchwork Mon Sep 30 10:33:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166463 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 0F32A16B1 for ; Mon, 30 Sep 2019 10:37:00 +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 DF8F3216F4 for ; Mon, 30 Sep 2019 10:36:59 +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="Li48+LBr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF8F3216F4 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 1iEt2M-0001IY-Uw; Mon, 30 Sep 2019 10:36:14 +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-0001Gl-UX for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:36:13 +0000 X-Inumbo-ID: 0c116c20-e36e-11e9-8628-bc764e2007e4 Received: from smtp-fw-33001.amazon.com (unknown [207.171.190.10]) by localhost (Halon) with ESMTPS id 0c116c20-e36e-11e9-8628-bc764e2007e4; Mon, 30 Sep 2019 10:35:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839740; x=1601375740; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=swDCRUW0LzPuFtPbYgjWPDHeLL7krWJ7Ji5Wu5oJhuE=; b=Li48+LBr7TC6GX0j+EzkoaYe2tGZa/11nBxIiREBNkshtyEgoIrty3HD KB7kEmoevInMhutsAdycRxngL9im6NyOzdw9EdyWVc/RIFkqhymn7VCm9 uHNhUd6dUmsaH8JZcBOfgHrU4sT6uSVkTIGyf5pqHg/p/TARyx7dzRp7t E=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="838005571" Received: from sea3-co-svc-lb6-vlan2.sea.amazon.com (HELO email-inbound-relay-1e-17c49630.us-east-1.amazon.com) ([10.47.22.34]) by smtp-border-fw-out-33001.sea14.amazon.com with ESMTP; 30 Sep 2019 10:34:40 +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-17c49630.us-east-1.amazon.com (Postfix) with ESMTPS id 91254A229C; Mon, 30 Sep 2019 10:34:09 +0000 (UTC) Received: from EX13D14UEE003.ant.amazon.com (10.43.62.11) by EX13MTAUEA001.ant.amazon.com (10.43.61.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:33:57 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D14UEE003.ant.amazon.com (10.43.62.11) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:33:57 +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:56 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:01 +0100 Message-ID: <1d32f7ba864218222339b87d95be88219743f6d7.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 09/55] x86/mm: add an end_of_loop label in modify_xen_mappings 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 soon need to clean up mappings whenever the out most loop is ended. Add a new label and turn relevant continue's into goto's. No functional change. Signed-off-by: Wei Liu --- xen/arch/x86/mm.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 3a799e17e4..b20d417fec 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5445,7 +5445,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) v += 1UL << L3_PAGETABLE_SHIFT; v &= ~((1UL << L3_PAGETABLE_SHIFT) - 1); - continue; + goto end_of_loop; } if ( l3e_get_flags(*pl3e) & _PAGE_PSE ) @@ -5463,7 +5463,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) l3e_write_atomic(pl3e, nl3e); v += 1UL << L3_PAGETABLE_SHIFT; - continue; + goto end_of_loop; } /* PAGE1GB: shatter the superpage and fall through. */ @@ -5507,7 +5507,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) v += 1UL << L2_PAGETABLE_SHIFT; v &= ~((1UL << L2_PAGETABLE_SHIFT) - 1); - continue; + goto end_of_loop; } if ( l2e_get_flags(*pl2e) & _PAGE_PSE ) @@ -5581,7 +5581,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) * skip the empty&free check. */ if ( (nf & _PAGE_PRESENT) || ((v != e) && (l1_table_offset(v) != 0)) ) - continue; + goto end_of_loop; if ( locking ) spin_lock(&map_pgdir_lock); @@ -5600,7 +5600,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) { if ( locking ) spin_unlock(&map_pgdir_lock); - continue; + goto end_of_loop; } l1t = l2e_to_l1e(*pl2e); @@ -5627,7 +5627,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) */ if ( (nf & _PAGE_PRESENT) || ((v != e) && (l2_table_offset(v) + l1_table_offset(v) != 0)) ) - continue; + goto end_of_loop; if ( locking ) spin_lock(&map_pgdir_lock); @@ -5640,7 +5640,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) { if ( locking ) spin_unlock(&map_pgdir_lock); - continue; + goto end_of_loop; } { @@ -5662,6 +5662,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) else if ( locking ) spin_unlock(&map_pgdir_lock); } + end_of_loop:; } flush_area(NULL, FLUSH_TLB_GLOBAL);