Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8DE8EC43331 for ; Thu, 2 Apr 2020 22:43:44 +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 4CC232077D for ; Thu, 2 Apr 2020 22:43:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="X5n/ClWc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4CC232077D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com 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 1jK8Ya-0006KE-CJ; Thu, 02 Apr 2020 22:43:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jK8YZ-0006K9-6j for xen-devel@lists.xenproject.org; Thu, 02 Apr 2020 22:43:27 +0000 X-Inumbo-ID: 5d819236-7533-11ea-83d8-bc764e2007e4 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 5d819236-7533-11ea-83d8-bc764e2007e4; Thu, 02 Apr 2020 22:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1585867406; h=subject:to:cc:references:from:message-id:date: mime-version:in-reply-to:content-transfer-encoding; bh=uVYC6oO1ty0lAm57ucXZlupeAKp0WsVoGFvRgui+BAI=; b=X5n/ClWclvLisapZLM+p4beGt9OBQh7mwd13flsUdf8GvIwL5gOvxDnZ HkEICalqfM9Aw6EpUPAr4RnTNxscqcwCcyBKn7Q0rRzdIA2tFwFUt8g+f 5F9R2/18IUsxG5QTmEFO0op1IsoO1UVGLG5cz3PPC5/DWqn6E334Q61tQ 0=; Authentication-Results: esa6.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 (esa6.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=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.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=esa6.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 (esa6.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=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: +53wbqHD07bWYySZWpsAtQXeUT1rL2MM1RFWftJ4iFemeyQxufr2KcLaB64Ebvupb5SkAcv9cs TslIpVbTilM4jGUqnLMcW/cj5DJ031JTvmR9K0MDZFa1u5cvveZRQ661OhqWPWG8vVenusLWai +o/JbbUVQj7RKrSRxrDNS0zPaTz8y8r6ILof0nDihDjGV+O9sdsZCp7Tcavg/SFz16r6pn/Bwx DGAbidlFq3aKvdRaSO9XuZ3c9NTN+LXCJYXdABzjARh+6mYIQhq7L21Ts8raQOrmFUIn4FKXvb 4Vc= X-SBRS: 2.7 X-MesageID: 15509565 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.72,337,1580792400"; d="scan'208";a="15509565" Subject: Re: [PATCH 3/5] x86/p2m: make p2m_remove_page()'s parameters type-safe To: Jan Beulich , "xen-devel@lists.xenproject.org" References: <3fbe1d2e-034a-31d7-7207-52ef8b335529@suse.com> <858f22e3-0f4f-08f0-ef67-b8ce67146537@suse.com> From: Andrew Cooper Message-ID: Date: Thu, 2 Apr 2020 23:43:22 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <858f22e3-0f4f-08f0-ef67-b8ce67146537@suse.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Language: en-GB X-ClientProxiedBy: AMSPEX02CAS02.citrite.net (10.69.22.113) To AMSPEX02CL02.citrite.net (10.69.22.126) 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 , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" On 01/04/2020 12:39, Jan Beulich wrote: > @@ -790,21 +789,23 @@ p2m_remove_page(struct p2m_domain *p2m, > &cur_order, NULL); > > if ( p2m_is_valid(t) && > - (!mfn_valid(_mfn(mfn)) || mfn + i != mfn_x(mfn_return)) ) > + (!mfn_valid(mfn) || !mfn_eq(mfn_add(mfn, i), mfn_return)) ) > return -EILSEQ; > > - i += (1UL << cur_order) - ((gfn_l + i) & ((1UL << cur_order) - 1)); > + i += (1UL << cur_order) - > + (gfn_x(gfn_add(gfn, i)) & ((1UL << cur_order) - 1)); We're gaining an number of expressions starting to look like this, but honestly, "gfn_x(gfn) + i" is equally typesafe, shorter, and easier to read IMO. ~Andrew