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=-8.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 9088BC433E3 for ; Wed, 22 Jul 2020 16:13:33 +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 669BC20787 for ; Wed, 22 Jul 2020 16:13:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 669BC20787 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.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.92) (envelope-from ) id 1jyHMf-0001dA-6L; Wed, 22 Jul 2020 16:13:05 +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.92) (envelope-from ) id 1jyHMd-0001d2-Tw for xen-devel@lists.xenproject.org; Wed, 22 Jul 2020 16:13:03 +0000 X-Inumbo-ID: 36ad1540-cc36-11ea-a1de-12813bfff9fa Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 36ad1540-cc36-11ea-a1de-12813bfff9fa; Wed, 22 Jul 2020 16:13:01 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id BC3ECABD2; Wed, 22 Jul 2020 16:13:07 +0000 (UTC) Subject: Re: [PATCH] x86/hvm: Clean up track_dirty_vram() calltree To: Andrew Cooper References: <20200722151548.4000-1-andrew.cooper3@citrix.com> From: Jan Beulich Message-ID: <07ecb7dd-c823-0c6a-2bcd-7fc22471af7a@suse.com> Date: Wed, 22 Jul 2020 18:13:00 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200722151548.4000-1-andrew.cooper3@citrix.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Xen-devel , Tim Deegan , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" On 22.07.2020 17:15, Andrew Cooper wrote: > * Rename nr to nr_frames. A plain 'nr' is confusing to follow in the the > lower levels. > * Use DIV_ROUND_UP() rather than opencoding it in several different ways > * The hypercall input is capped at uint32_t, so there is no need for > nr_frames to be unsigned long in the lower levels. > > No functional change. > > Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich I'd like to note though that ... > --- a/xen/arch/x86/mm/hap/hap.c > +++ b/xen/arch/x86/mm/hap/hap.c > @@ -58,16 +58,16 @@ > > int hap_track_dirty_vram(struct domain *d, > unsigned long begin_pfn, > - unsigned long nr, > + unsigned int nr_frames, > XEN_GUEST_HANDLE(void) guest_dirty_bitmap) > { > long rc = 0; > struct sh_dirty_vram *dirty_vram; > uint8_t *dirty_bitmap = NULL; > > - if ( nr ) > + if ( nr_frames ) > { > - int size = (nr + BITS_PER_BYTE - 1) / BITS_PER_BYTE; > + unsigned int size = DIV_ROUND_UP(nr_frames, BITS_PER_BYTE); ... with the change from long to int this construct will now no longer be correct for the (admittedly absurd) case of a hypercall input in the range of [0xfffffff9,0xffffffff]. We now fully depend on this getting properly rejected at the top level hypercall handler (which limits to 1Gb worth of tracked space). Jan