From nobody Fri Apr 26 02:35:40 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.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=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1556916699; cv=none; d=zoho.com; s=zohoarc; b=NUcGPuQJsLbBiAFLRANAuLYITH/trueDMLqWS+pe014RtHbiT6Fl9lxYLhrw5WZidVNJeukIipRg8h8fDs8NznYYOu+GSt1C5ayqhARwrENNB3OqXvDyzzSSk2Jvgn2NoQw7jgyU+slwhXs1j8myAAwEKXsA5Fr4x3IBmUyb/uY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556916699; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Fu46ZbpSFV6HJcbUI9VcoFtjXZbW9YKKQkhj2JefIVU=; b=QK1QrM/jC7xqdfyxoNuiwYV6sol7EjtFARg2EsjVwkKv/djXwPhPQpHJ2MMrhu4VAoN4QjEV2p5cgb9xctGUdyd+nyEwz7MulzaOCNQLZqelIZiWADiaTbEgd3GO1eiVU6AebwhKRbr56rms1FkG56OwRiXi+Yy+/ifqvxhIguY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=none (zoho.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 1556916699619678.2204986721739; Fri, 3 May 2019 13:51:39 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMf8M-0006Vw-RJ; Fri, 03 May 2019 20:50:18 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMf8M-0006Vn-1F for xen-devel@lists.xenproject.org; Fri, 03 May 2019 20:50:18 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 0e26373e-6de5-11e9-843c-bc764e045a96; Fri, 03 May 2019 20:50:16 +0000 (UTC) Received: from sstabellini-ThinkPad-X260.xilinx.com (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B87E92087F; Fri, 3 May 2019 20:50:15 +0000 (UTC) X-Inumbo-ID: 0e26373e-6de5-11e9-843c-bc764e045a96 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556916616; bh=+84OtcGsSXxXUmW9bHPCL6uFaWyF6QgG3w3gqS5A+BA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ocluEOABpEoxn05t0+T6pzVqNyWTmMwmZZRWlNhLAGZsOEPb/wNI5sz4/R6gCdDkR j1fQcqF/Tx9mVhFxhRQ08YCus1qdwmqukIF3hiBr1JqIbmIH1VAIWUC506+z0jFC4G 1Kv4ZkkybgJmtYFZqhsdn2v+t2MNKa06sblnQD18= From: Stefano Stabellini To: julien.grall@arm.com Date: Fri, 3 May 2019 13:50:13 -0700 Message-Id: <1556916614-21512-2-git-send-email-sstabellini@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Subject: [Xen-devel] [PATCH 2/3] xen: actually skip the first MAX_ORDER bits in pfn_pdx_hole_setup 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: Stefano Stabellini , sstabellini@kernel.org, wei.liu2@citrix.com, konrad.wilk@oracle.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, JBeulich@suse.com, xen-devel@lists.xenproject.org MIME-Version: 1.0 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) pfn_pdx_hole_setup is meant to skip the first MAX_ORDER bits, but actually it only skips the first MAX_ORDER-1 bits. The issue was probably introduced by bdb5439c3f, when changing to loop to start from MAX_ORDER-1 an adjustment by 1 was needed in the call to find_next_bit() but not done. Fix the issue by passing j+1 and i+1 to find_next_zero_bit and find_next_bit. Also add a check for i >=3D BITS_PER_LONG because find_{,next_}zero_bit() on x86 assume their last argument to be less than their middle one. Signed-off-by: Stefano Stabellini Signed-off-by: Jan Beulich CC: andrew.cooper3@citrix.com CC: JBeulich@suse.com CC: George.Dunlap@eu.citrix.com CC: ian.jackson@eu.citrix.com CC: konrad.wilk@oracle.com CC: tim@xen.org CC: wei.liu2@citrix.com --- xen/common/pdx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 50c21b6..bb7e437 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -83,8 +83,10 @@ void __init pfn_pdx_hole_setup(unsigned long mask) */ for ( j =3D MAX_ORDER-1; ; ) { - i =3D find_next_zero_bit(&mask, BITS_PER_LONG, j); - j =3D find_next_bit(&mask, BITS_PER_LONG, i); + i =3D find_next_zero_bit(&mask, BITS_PER_LONG, j + 1); + if ( i >=3D BITS_PER_LONG ) + break; + j =3D find_next_bit(&mask, BITS_PER_LONG, i + 1); if ( j >=3D BITS_PER_LONG ) break; if ( j - i > hole_shift ) --=20 1.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel