From nobody Tue Nov 26 15:22:31 2024 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=1706869926; cv=none; d=zohomail.com; s=zohoarc; b=gFOXa9EVc0ih8VEjUH9l6tWoHrq6F0AZX1ZcACgHAmWNT3OW4Wj8knA3wxlGckuzno/wmAsgc6qua1096Uh/eOPplekYzykvnm1qduEhSuZt2m9IpOHupDgml6lkM6jkk0xSQcGy6EVGasIwvduObrusBlYxcVz6HcI6jgM5aBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706869926; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZezFfAc9khgs7hj27BwXSI87lihBOShkrXxYtsGi1i8=; b=VUuwhj6n4IhwEq/rlgqZMsB+MH5c6rCYZ2gI4WS+DI6CwXG9kR92nbgGL/83xKsEah3H0c8ZKt6MOpBq7CYKvX3cOXGSvRCJQjoLxFK/qjX9YE4Ku70lCaLMgzVI8F9wMwjyTg4aIZ4MfHYijOThZ919vGA4H1ZYBrNrtMc/7gQ= 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 1706869926097433.95072545978746; Fri, 2 Feb 2024 02:32:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVqoH-0008Du-EO; Fri, 02 Feb 2024 05:30:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVqoF-0008DM-K0 for qemu-devel@nongnu.org; Fri, 02 Feb 2024 05:30:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVqoE-0001oo-4N for qemu-devel@nongnu.org; Fri, 02 Feb 2024 05:30:11 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-175-eTppH7PPPISzg2vN_vHX6g-1; Fri, 02 Feb 2024 05:30:01 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B161085A58F; Fri, 2 Feb 2024 10:30:00 +0000 (UTC) Received: from x1n.redhat.com (unknown [10.72.116.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94F1540C95AD; Fri, 2 Feb 2024 10:29:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706869809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZezFfAc9khgs7hj27BwXSI87lihBOShkrXxYtsGi1i8=; b=QX14E3GX8CiDo5VQwKJgufEBBzjCa63B7kwp5O5suh6/5NnWPW/TQhA6bQVcgeIb/3FVUz 5N5CIc+E207+E+/Eo/ivJQftH4qpDV9fv+cO54+A6ctqU1+wtB6dnRJR/yNXIKg1WqqD0v MOUcbKS2W5JA76V3M+Ei6jW5iFCpYaY= X-MC-Unique: eTppH7PPPISzg2vN_vHX6g-1 From: peterx@redhat.com To: qemu-devel@nongnu.org Cc: Hao Xiang , Bryan Zhang , Fabiano Rosas , peterx@redhat.com, Avihai Horon , Yuan Liu , Prasad Pandit Subject: [PATCH v2 08/23] migration/multifd: Drop pages->num check in sender thread Date: Fri, 2 Feb 2024 18:28:42 +0800 Message-ID: <20240202102857.110210-9-peterx@redhat.com> In-Reply-To: <20240202102857.110210-1-peterx@redhat.com> References: <20240202102857.110210-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.292, 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_H2=-0.001, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1706869927390100009 Content-Type: text/plain; charset="utf-8" From: Peter Xu Now with a split SYNC handler, we always have pages->num set for pending_job=3D=3Dtrue. Assert it instead. Reviewed-by: Fabiano Rosas Signed-off-by: Peter Xu --- migration/multifd.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index 4d5a01ed93..518f9de723 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -710,13 +710,14 @@ static void *multifd_send_thread(void *opaque) p->iovs_num =3D 1; } =20 - if (pages->num) { - ret =3D multifd_send_state->ops->send_prepare(p, &local_er= r); - if (ret !=3D 0) { - qemu_mutex_unlock(&p->mutex); - break; - } + assert(pages->num); + + ret =3D multifd_send_state->ops->send_prepare(p, &local_err); + if (ret !=3D 0) { + qemu_mutex_unlock(&p->mutex); + break; } + multifd_send_fill_packet(p); p->num_packets++; p->total_normal_pages +=3D pages->num; --=20 2.43.0