From nobody Tue Feb 10 12:59:57 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661433825; cv=none; d=zohomail.com; s=zohoarc; b=Z475i3Lc2RDomAUeNOxXK1iUdNUYggWcgwiqZaZmO8oW2TeqQ/MSuQuf0f5JnSCoTd8siZeWZNw18whY95XH4Pr9JymT6rdoz9I5z8S6St1/crTuCv3AIINJ6aKPEr1rOs7Cds4B7Y/vpDs0uhpbtjS8O98rwcNSbkNSt4YizCo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661433825; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6RsaNSlRnxhrIkdYMtpbZcR2E/o687z00sVkGUTKAmg=; b=U7zYc38Ljv0uCo/o7U81wLJIHUc/1rFOQfV3nKMmREOsRLgD/mtuTYakk1GDU/fBpF3GpQP/ozrgHZWlGf03Sovho7QJ3I9ygB3wDHsA+tTmZWZPyzL9tLHCayAJP1FW0z0fKlb5hrClthnrOClMMWFR3yza3HGTeQXzF69tn6k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1661433825945864.6739159698818; Thu, 25 Aug 2022 06:23:45 -0700 (PDT) Received: from localhost ([::1]:34634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRCpk-00040t-DK for importer@patchew.org; Thu, 25 Aug 2022 09:23:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRCnW-0002Jp-NZ for qemu-devel@nongnu.org; Thu, 25 Aug 2022 09:21:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:54871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRCnT-0000rI-Kt for qemu-devel@nongnu.org; Thu, 25 Aug 2022 09:21:24 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-172-6q4ISBs7OF6DoZSaPlAU3g-1; Thu, 25 Aug 2022 09:21:20 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 37B0F38149A8; Thu, 25 Aug 2022 13:21:20 +0000 (UTC) Received: from localhost (unknown [10.39.208.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44239492C3B; Thu, 25 Aug 2022 13:21:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661433681; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6RsaNSlRnxhrIkdYMtpbZcR2E/o687z00sVkGUTKAmg=; b=F3Dr8XR2UvToxWuFj/ZeIaljZafknNmectYyiYUAaHAb+TqVrl/GR78fzBIFliZ1uIQXa5 fCEFEeFFqRpfTavUMGH305CyxxnN0dBQVdSWy87geN/3HzpMKa2vBRgJNaoxhsdgOIYmhw qk8dgi2i5artaNy/pU3oSqT+k9QcK/M= X-MC-Unique: 6q4ISBs7OF6DoZSaPlAU3g-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qiaonuohan@cn.fujitsu.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , David Hildenbrand , Stefan Berger Subject: [PATCH 1/2] dump: simplify a bit kdump get_next_page() Date: Thu, 25 Aug 2022 17:21:09 +0400 Message-Id: <20220825132110.1500330-2-marcandre.lureau@redhat.com> In-Reply-To: <20220825132110.1500330-1-marcandre.lureau@redhat.com> References: <20220825132110.1500330-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661433827119100001 From: Marc-Andr=C3=A9 Lureau This should be functionally equivalent, but slightly easier to read, with simplified paths and checks at the end of the function. The following patch is a major rewrite to get rid of the assert(). Signed-off-by: Marc-Andr=C3=A9 Lureau --- dump/dump.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dump/dump.c b/dump/dump.c index 4d9658ffa2..18f06cffe2 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -1107,37 +1107,31 @@ static bool get_next_page(GuestPhysBlock **blockptr= , uint64_t *pfnptr, uint8_t *buf; =20 /* block =3D=3D NULL means the start of the iteration */ - if (!block) { - block =3D QTAILQ_FIRST(&s->guest_phys_blocks.head); - *blockptr =3D block; - assert((block->target_start & ~target_page_mask) =3D=3D 0); - assert((block->target_end & ~target_page_mask) =3D=3D 0); - *pfnptr =3D dump_paddr_to_pfn(s, block->target_start); - if (bufptr) { - *bufptr =3D block->host_addr; - } - return true; + if (block =3D=3D NULL) { + *blockptr =3D block =3D QTAILQ_FIRST(&s->guest_phys_blocks.head); + addr =3D block->target_start; + } else { + addr =3D dump_pfn_to_paddr(s, *pfnptr + 1); } - - *pfnptr =3D *pfnptr + 1; - addr =3D dump_pfn_to_paddr(s, *pfnptr); + assert(block !=3D NULL); =20 if ((addr >=3D block->target_start) && (addr + s->dump_info.page_size <=3D block->target_end)) { buf =3D block->host_addr + (addr - block->target_start); } else { /* the next page is in the next block */ - block =3D QTAILQ_NEXT(block, next); - *blockptr =3D block; + *blockptr =3D block =3D QTAILQ_NEXT(block, next); if (!block) { return false; } - assert((block->target_start & ~target_page_mask) =3D=3D 0); - assert((block->target_end & ~target_page_mask) =3D=3D 0); - *pfnptr =3D dump_paddr_to_pfn(s, block->target_start); + addr =3D block->target_start; buf =3D block->host_addr; } =20 + /* those checks are going away next */ + assert((block->target_start & ~target_page_mask) =3D=3D 0); + assert((block->target_end & ~target_page_mask) =3D=3D 0); + *pfnptr =3D dump_paddr_to_pfn(s, addr); if (bufptr) { *bufptr =3D buf; } --=20 2.37.2