From nobody Fri May 3 08:58:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1576513258; cv=none; d=zohomail.com; s=zohoarc; b=blWYUSTeapbzfLDZ83jCInMK2RkuwAWlaKXAciga8cd1H5xClMsJkVHIgAE6Ou6nYUTJ3HI02mfo/g9djKIcCizHhCQGydZxP/EhKe08N6iDqs2w21SC20s4aSc3opjZLFhIqH85bAWvX2UGjVaTG+PLNhIhFILNejf88zTJhBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576513258; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=TQ1u4zJJBySmOe46VpE6OB4dxLB95duq1eQfCJxUtQk=; b=GulV4B9yOQIp51AKKgC1x9dBtMtXxJcVA7lGLM/NpE9ZlVBBTQp/VAcNrwdNeOEjd8yot+rIzYgPaMgGZEH8vDd6U07nUmnCemojzei4+H9fR6fMobQdMj3owA03hZC2N74dkJArYTTQk04VTx5BnvvpRbJHdK1D9rcV7wJIdss= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1576513258701612.561330963297; Mon, 16 Dec 2019 08:20:58 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1igt6S-0000uw-6L; Mon, 16 Dec 2019 16:20:12 +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 1igt6R-0000uq-GE for xen-devel@lists.xenproject.org; Mon, 16 Dec 2019 16:20:11 +0000 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id edff7fe4-201f-11ea-93ce-12813bfff9fa; Mon, 16 Dec 2019 16:20:10 +0000 (UTC) X-Inumbo-ID: edff7fe4-201f-11ea-93ce-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1576513210; h=from:to:cc:subject:date:message-id:mime-version; bh=HBxs8UIf8Pud+IjotW2Neqws+22+wjfkoJoV876hFn8=; b=PwcX28t7/rL4QcINtniF6OEADXPfgr3B50rjfHamD1p/C/wKHKi7Oxzc OZemw82DWX8UcfcOiKwtNmRGOXj3oIhWlLHNS1uOcipzSLrh1T7PUOs+d O8U2cjNx9iWBDHgJi4jryn7B7ujwHwUjZpfi+LzX0Kf7nbi4+OY4o+JE0 4=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: blMCTRamy8ugChA5EGQ7GHCC5jnUFzi/6nC4UAqOXepCaF/USxXtkyGQb6nazgWkTlVDRwVJUq X12Yv4kDMnoeD3H2zDp6BbkEcACxCs4VcoaJYN/Wvaaf3YCs3/0SW5OJuDtPsX9kTzq+5LvuF3 G5TI4M1bFwkadAuPRRjq40ywTj4I3AvIJKutInrXcHHj3xgJLxbRlAl35AtSpVsMPJrX22pPdo VmyGbYNKSdcgmUtS2W7gEYYxUUnuSzapgQIQKCcOtGh81/ozQXDz8YF1akQEdnulr+HEnFT11r yig= X-SBRS: 2.7 X-MesageID: 9729309 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.69,322,1571716800"; d="scan'208";a="9729309" From: Andrew Cooper To: Xen-devel Date: Mon, 16 Dec 2019 16:20:06 +0000 Message-ID: <20191216162006.15260-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] x86/mm: Simplify promote_l4_table()'s exit semantics 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: George Dunlap , Andrew Cooper , Jan Beulich Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) promote_l4_table() is different from its lower level helpers, by having an extra return path out of the middle of the loop in the case of a failure. Break from the loop, which is consistent with the other helpers, and functionally equivalent. Signed-off-by: Andrew Cooper Reviewed-by: George Dunlap --- CC: Jan Beulich CC: George Dunlap --- xen/arch/x86/mm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index c14c677a62..594f1bd290 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1856,10 +1856,7 @@ static int promote_l4_table(struct page_info *page) } } if ( rc < 0 ) - { - unmap_domain_page(pl4e); - return rc; - } + break; =20 pl4e[i] =3D adjust_guest_l4e(l4e, d); } --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel