From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:ac2:5042:0:0:0:0:0 with SMTP id a2csp2518078lfm; Fri, 3 Jul 2020 07:20:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybH2U+im+hZlKAmWyWNSo8e3mK4sOtfOGQvqZ78+gwRJHL29kIBYPDnPejPpKnMHPOEBLP X-Received: by 2002:a67:c18c:: with SMTP id h12mr1166172vsj.131.1593786040286; Fri, 03 Jul 2020 07:20:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593786040; cv=none; d=google.com; s=arc-20160816; b=BoCOv4qdoPi90nfVwiNzxuT5UHSIID9JrRoKIRrN+erHIzw4ldxMWnhFVPF7ICSPER i+WJPivqapFvThT8hj8uPrjq2cULmO1evDD8m6XKVQn05JoLF1id4v+RJYB978PdWqq9 qWlxARALqM15r3OmioCRv1RuNhvlfNd4R0F4MHPtBlIXVrgNkYnt5VFbhAcTZiJWRdpi h+OL7Bdn0YT5nkRlBN+q6NnXLdxKSykR4pvMDu6z+3peg2jMIKPnNJdifYGn4a/ZlYB5 7z1EixWic4TRKsyeKWPL1kSVETrcHCnSjxt58zPjWoyuy5NjHkOSiRYWiOFaFBOT/+Pf j2qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-disposition:user-agent :in-reply-to:mime-version:references:message-id:subject:to:from:date :dkim-signature; bh=PVTzsTheAmn9jl3yypvrWQaZhVAP5++U24xp6ZqKoTM=; b=VyltZDUmulFifdhw7o0Q7ko9ZkAG0yorbANFehJKFQ0AcbSjr2yANTmbjy2ARvZzQc pWCr2gbfQsCo+Yb2R/x8c7F1ZzK1TuEb3Wk5aK2iXqrIY24iKLFCZ+apHTTmEFxjHqiP m67/+AsYkrur8CfuQzyUq+o6uGPlUzq/2Od66VaxqVCht7J70JS6N1p/ElJ8A+7tccBH YwaA98NKdZ2egayMAI+53LhUFOHoGlKrVAJ0DaIfB2IqD4x8ldN+4wOlmWENaaw89eY4 PeQBSXbnVBo58qrqskB4v4tz5yswsfGsxwLlabbXxtsyFFBHgnyVd/ww/hDTHcI9bAs3 hGow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=B0YegNiO; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 74si1536151uaq.119.2020.07.03.07.20.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Jul 2020 07:20:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=B0YegNiO; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:58576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrMYR-0003sh-IX for alex.bennee@linaro.org; Fri, 03 Jul 2020 10:20:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrMYG-0003ki-1Q for qemu-arm@nongnu.org; Fri, 03 Jul 2020 10:20:29 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:33420 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jrMYC-0006T1-Eu for qemu-arm@nongnu.org; Fri, 03 Jul 2020 10:20:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593786023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=PVTzsTheAmn9jl3yypvrWQaZhVAP5++U24xp6ZqKoTM=; b=B0YegNiOeta373i3NLTw8IfRNRaIz2Hg9t6Hj4qRzbqafzDWcrLmR/r1TPXWKu0ZwhE4Yu bQWlSRhhKhf1h80mgck7wxJigb8UvfBkhRv+GGpHrs1/w9dqfXwNWJU1cmtIWJuWismfXs my2EhR0Al7lplz57RmbqE7MlL+OIa5A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-186-5Z7nsEoAMau7dVzQ6wlZUg-1; Fri, 03 Jul 2020 10:20:20 -0400 X-MC-Unique: 5Z7nsEoAMau7dVzQ6wlZUg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E4D18107ACCA; Fri, 3 Jul 2020 14:20:17 +0000 (UTC) Received: from work-vm (ovpn-114-207.ams2.redhat.com [10.36.114.207]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 28BB971682; Fri, 3 Jul 2020 14:20:16 +0000 (UTC) Date: Fri, 3 Jul 2020 15:20:13 +0100 From: "Dr. David Alan Gilbert" To: Keqian Zhu Subject: Re: [PATCH v3] migration: Count new_dirty instead of real_dirty Message-ID: <20200703142013.GC36813@work-vm> References: <20200622032037.31112-1-zhukeqian1@huawei.com> MIME-Version: 1.0 In-Reply-To: <20200622032037.31112-1-zhukeqian1@huawei.com> User-Agent: Mutt/1.14.5 (2020-06-23) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.61; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/03 03:17:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, Juan Quintela , wanghaibin.wang@huawei.com, Chao Fan , qemu-devel@nongnu.org, qemu-arm@nongnu.org, jianjay.zhou@huawei.com, Paolo Bonzini Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: Ke+LmdZ2HP3M * Keqian Zhu (zhukeqian1@huawei.com) wrote: > real_dirty_pages becomes equal to total ram size after dirty log sync > in ram_init_bitmaps, the reason is that the bitmap of ramblock is > initialized to be all set, so old path counts them as "real dirty" at > beginning. > > This causes wrong dirty rate and false positive throttling. > > Signed-off-by: Keqian Zhu OK, Reviewed-by: Dr. David Alan Gilbert and queued. you might still want to look at migration_trigger_thrtottle and see if you can stop the throttling if in the RAM bulk stage. > --- > Changelog: > > v3: > - Address Dave's comments. > > v2: > - Use new_dirty_pages instead of accu_dirty_pages. > - Adjust commit messages. > --- > include/exec/ram_addr.h | 5 +---- > migration/ram.c | 8 +++++--- > 2 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h > index 7b5c24e928..3ef729a23c 100644 > --- a/include/exec/ram_addr.h > +++ b/include/exec/ram_addr.h > @@ -442,8 +442,7 @@ static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start, > static inline > uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb, > ram_addr_t start, > - ram_addr_t length, > - uint64_t *real_dirty_pages) > + ram_addr_t length) > { > ram_addr_t addr; > unsigned long word = BIT_WORD((start + rb->offset) >> TARGET_PAGE_BITS); > @@ -469,7 +468,6 @@ uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb, > if (src[idx][offset]) { > unsigned long bits = atomic_xchg(&src[idx][offset], 0); > unsigned long new_dirty; > - *real_dirty_pages += ctpopl(bits); > new_dirty = ~dest[k]; > dest[k] |= bits; > new_dirty &= bits; > @@ -502,7 +500,6 @@ uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb, > start + addr + offset, > TARGET_PAGE_SIZE, > DIRTY_MEMORY_MIGRATION)) { > - *real_dirty_pages += 1; > long k = (start + addr) >> TARGET_PAGE_BITS; > if (!test_and_set_bit(k, dest)) { > num_dirty++; > diff --git a/migration/ram.c b/migration/ram.c > index 069b6e30bc..5554a7d2d8 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -859,9 +859,11 @@ static inline bool migration_bitmap_clear_dirty(RAMState *rs, > /* Called with RCU critical section */ > static void ramblock_sync_dirty_bitmap(RAMState *rs, RAMBlock *rb) > { > - rs->migration_dirty_pages += > - cpu_physical_memory_sync_dirty_bitmap(rb, 0, rb->used_length, > - &rs->num_dirty_pages_period); > + uint64_t new_dirty_pages = > + cpu_physical_memory_sync_dirty_bitmap(rb, 0, rb->used_length); > + > + rs->migration_dirty_pages += new_dirty_pages; > + rs->num_dirty_pages_period += new_dirty_pages; > } > > /** > -- > 2.19.1 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK