From nobody Thu May 2 22:11:55 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1678357849; cv=none; d=zohomail.com; s=zohoarc; b=cEiGKB4OebJxpVJWdYrt9UbdnUPX1nL60TRlm7t7z51Gib1ZPZe+FAc0gvnGRzWu1VR9JENlDX3q5rI2nC9CpyTpE46qeEqRhoJuvm1zH9lOjVZj15QoAaICnO3NZg+nrZaYHmc1WVueq5L9kBVhfisLPu2JEPrYcESfr/Lc95k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678357849; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=sPIVQrQbUdJOahAWr5og1B0xek7q3Xe/RfkG82qtfSI=; b=T9tObLPQCAxxAAUhAKa0iR/Lpj5Y39XL6YmPRQU9SU6V/s9c2qqhcFgNmjR3hA11JJZFklqNtUNZuhDoEO6Ymhmwnv8U6pxJkhZkH5zbIsgodxQneazKIXdJBrEB8Voq2pJO5+uLWBmjByxGM3EACkXKLjuIFbxL3zRvvoH3xMY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=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 1678357849066277.8501409708392; Thu, 9 Mar 2023 02:30:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paDXD-00053s-Up; Thu, 09 Mar 2023 05:30:07 -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 1paDXC-00053k-65 for qemu-devel@nongnu.org; Thu, 09 Mar 2023 05:30:06 -0500 Received: from mga12.intel.com ([192.55.52.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1paDXA-0005NK-1O for qemu-devel@nongnu.org; Thu, 09 Mar 2023 05:30:05 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Mar 2023 02:29:59 -0800 Received: from tdx-lm.sh.intel.com ([10.239.53.27]) by fmsmga002.fm.intel.com with ESMTP; 09 Mar 2023 02:29:58 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678357804; x=1709893804; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=yv1WAkaEUJq6B8lHZoSDox5n0FnnMQ6a34L5ICRHjwk=; b=mLv1ZlC46+dMh4lcbijZDceU55qEDqG+Xk5ReAu1WuAtJj4KMqa5HMDo O/WeSWjVsvmmPwVmRR2JsyJYRXaQuLU8EJ4lI9sWEdfoOxhteKMm1i/Pf QgGdr4Lx9Mr/tZuVFn0aE4Ja8CrysknopCgsXL8cA5BbGCczWTd8jCMhO JkXkTcUwUs6CavoY2M3Zb6wiE6u1DI36dbngz21RTlCxMGKWkWlBPt8xx eqYUzZ59KgBN+7YkT8iy2DgDXcJ4YPDAcKSkcja3olccFZcSgK28mqjSV 0Q229tKtl1h+GlS45jgJjM6Od0vRIkmhA1aWmD0AL8BguITRoIv7iv6kb w==; X-IronPort-AV: E=McAfee;i="6500,9779,10643"; a="316069720" X-IronPort-AV: E=Sophos;i="5.98,246,1673942400"; d="scan'208";a="316069720" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10643"; a="787510012" X-IronPort-AV: E=Sophos;i="5.98,246,1673942400"; d="scan'208";a="787510012" From: Wei Wang To: quintela@redhat.com, dgilbert@redhat.com Cc: qemu-devel@nongnu.org, Wei Wang Subject: [PATCH v1] migration/multifd: correct multifd_send_thread to trace the flags Date: Thu, 9 Mar 2023 18:29:56 +0800 Message-Id: <20230309102956.8030-1-wei.w.wang@intel.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.136; envelope-from=wei.w.wang@intel.com; helo=mga12.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1678357850036100001 Content-Type: text/plain; charset="utf-8" The p->flags could be updated via the send_prepare callback, e.g. OR-ed with MULTIFD_FLAG_ZLIB via zlib_send_prepare. Assign p->flags to the local "flags" before the send_prepare callback could only get partial of p->flags. Fix it by moving the assignment of p->flags to the local flags after the callback, so that the correct flags can be traced. Fixes: ab7cbb0b9a3b ("multifd: Make no compression operations into its own = structure") Signed-off-by: Wei Wang Reviewed-by: Juan Quintela --- migration/multifd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/multifd.c b/migration/multifd.c index 5e85c3ea9b..cbc0dfe39b 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -677,7 +677,7 @@ static void *multifd_send_thread(void *opaque) =20 if (p->pending_job) { uint64_t packet_num =3D p->packet_num; - uint32_t flags =3D p->flags; + uint32_t flags; p->normal_num =3D 0; =20 if (use_zero_copy_send) { @@ -699,6 +699,7 @@ static void *multifd_send_thread(void *opaque) } } multifd_send_fill_packet(p); + flags =3D p->flags; p->flags =3D 0; p->num_packets++; p->total_normal_pages +=3D p->normal_num; --=20 2.27.0