From nobody Sun May 5 22:15:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=qnap.com ARC-Seal: i=1; a=rsa-sha256; t=1599833270; cv=none; d=zohomail.com; s=zohoarc; b=MRtNQe8zh84Rb+1125AJWiL4Z3pxfcTd5N3TrjuF27KiATWefCL3TDwKkVo+P3q92WYfuWvkDtJdEq85+LmKamLChqf/ObvS0GIZoO7tKE06608URHXXbbTdkvYYb2yuEFRvoYNIPSuRzUiCRQuAa+K6PFro6FNXbEOtWnhRbJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599833270; h=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=yc2O5Wa6K6s4opTbeAyI6WQxmH83VIozCbZYKuarzYI=; b=XPt106f/H5QOAG+VAEA+voP9VZzhiZFqenAu6Pc+caxQxpskwcdJjsao/YSxBsz1l5eDgG3a4PskBPPZfT51q4IFRbGaqnc3CI5yExNSmLkIRlnSiKwoJRpdNzjEqn4fW+Jh03F3bHcHUu7jDO9500avxT5lib3sAzB7AoaNdc8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599833270065210.69650358922684; Fri, 11 Sep 2020 07:07:50 -0700 (PDT) Received: from localhost ([::1]:48146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGjiO-00031Q-LF for importer@patchew.org; Fri, 11 Sep 2020 10:07:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGjgy-0000Rn-18 for qemu-devel@nongnu.org; Fri, 11 Sep 2020 10:06:20 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:41906) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kGjgw-0000E2-Dt for qemu-devel@nongnu.org; Fri, 11 Sep 2020 10:06:19 -0400 Received: by mail-pf1-x441.google.com with SMTP id z19so7417759pfn.8 for ; Fri, 11 Sep 2020 07:06:18 -0700 (PDT) Received: from localhost.localdomain (211-23-39-77.HINET-IP.hinet.net. [211.23.39.77]) by smtp.googlemail.com with ESMTPSA id y5sm2203179pge.62.2020.09.11.07.06.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 07:06:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qnap.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yc2O5Wa6K6s4opTbeAyI6WQxmH83VIozCbZYKuarzYI=; b=fABPhvIHsGOtdCzRLODjmuzrf9huLHT8rHEfaTldnzjJ/1TKheQPOAuY5IPEtXEgV8 qznkJl/oiAUwcDbmm/u0B9fQRVbrP9jJ0L350R0648Bj5EbrOLJxQJxNwQ3vVvX+xHNN Ho8bGaJks7RgdqJv9fyEgjBDB//5I6/dk8VdY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yc2O5Wa6K6s4opTbeAyI6WQxmH83VIozCbZYKuarzYI=; b=CRwMC7rSuV+P4fhBnU6lBiAvQqDQRq0EaRoCBJFy8tyfpsTdOvo266SEYUj2p9Wwg6 4Lh2QCvu+oqiVGPB5BlsJSzXlMXF2eIyjWNUYw7AAKlFf0ChZLnJ7ggGOSmHUIGxyMF7 HUA6e50oZTDnRtuOxFprjV3qpHxx0y3+ohpJN8erHVB3oiCJzpDpWMsgNqb65TRsjiO2 Nm/ISuLYEPTETUqmTOC+WgqAY83Wqt3rYYzMYPPkOBTrt6yuesxaCC8/4zMfPz+cqedQ EwWArSTGM47W3LHbCuS/bXV4mXH06vBzedHhHeTOwFc4vlNShnep7v5vQeDXJj0ys7CM nBnw== X-Gm-Message-State: AOAM532auupNyUqaWegMfVgSHYYLzPauAxYbwR1YX0QIOUhcqlO4XBXX 9QCBBcLpiorYY+VcaLu6radekBNh14LdpRwq X-Google-Smtp-Source: ABdhPJwaZNt8NrtJzoOjROFSwdGDPoW50tNgRYYSeS++iAWScQuZIqevHbp/ZW5FBEgUrjwZF1y9+A== X-Received: by 2002:a63:1464:: with SMTP id 36mr1773248pgu.160.1599833176668; Fri, 11 Sep 2020 07:06:16 -0700 (PDT) From: Derek Su To: qemu-devel@nongnu.org Subject: [PATCH v1 1/2] colo-compare: Fix incorrect data type conversion Date: Fri, 11 Sep 2020 19:05:07 +0000 Message-Id: <20200911190508.1316487-2-dereksu@qnap.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200911190508.1316487-1-dereksu@qnap.com> References: <20200911190508.1316487-1-dereksu@qnap.com> 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::441; envelope-from=dereksu@qnap.com; helo=mail-pf1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 43 X-Spam_score: 4.3 X-Spam_bar: ++++ X-Spam_report: (4.3 / 5.0 requ) BAYES_00=-1.9, DATE_IN_FUTURE_03_06=3.027, 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Derek Su , chen.zhang@intel.com, jasowang@redhat.com, lizhijian@cn.fujitsu.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Fix data type conversion of compare_timeout. The incorrect conversion results in a random compare_timeout value and unexpected stalls in packet comparison. Signed-off-by: Derek Su --- net/colo-compare.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 2c20de1537..c4de86ef34 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -619,11 +619,12 @@ static int colo_packet_compare_other(Packet *spkt, Pa= cket *ppkt) ppkt->size - offset); } =20 -static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time) +static int colo_old_packet_check_one(Packet *pkt, void *user_data) { int64_t now =3D qemu_clock_get_ms(QEMU_CLOCK_HOST); + uint32_t check_time =3D *(uint32_t *)user_data; =20 - if ((now - pkt->creation_ms) > (*check_time)) { + if ((now - pkt->creation_ms) > check_time) { trace_colo_old_packet_check_found(pkt->creation_ms); return 0; } else { --=20 2.25.1 From nobody Sun May 5 22:15:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=qnap.com ARC-Seal: i=1; a=rsa-sha256; t=1599833267; cv=none; d=zohomail.com; s=zohoarc; b=KbVMW6OhCuSC9Oe3jZi7pO0fTg0kRVwBMcQ7MerBIzW24ZCN64gXqqlT0PEbmE5E0X9QcU5s357DIjbZnG3ZGzzZvJdz6N+11RuKdZ/bfOld8wLZ4ohKq7hQCieRzlFYZ2U/lT7o6SAlS2NOwVRsQqNQEyhMQc7EBbGgkwvuMtA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599833267; h=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=PuHXsiU+oecnkGPtxK75s3vxc3sJrd16mO4Uu96aLyk=; b=aE9lP6Ii4q/k0qsNznQw2k93JN8+C0pAi+e1wnR/1YGA71Sx4suKcc7gtUenn2hU5PL56Vg3lJDBafRMuWsUnUMa8B1Au3BoQrNrW7IF6wRxpoF1+eQNowRf0h1Pqr7Abfb6XAirnSEFSMmEynebbWKhQtxyZGGDyjE2qJJ9s8A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599833267472731.493414780846; Fri, 11 Sep 2020 07:07:47 -0700 (PDT) Received: from localhost ([::1]:47892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGjiM-0002v5-0L for importer@patchew.org; Fri, 11 Sep 2020 10:07:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGjhF-00018Z-Lx for qemu-devel@nongnu.org; Fri, 11 Sep 2020 10:06:37 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:41545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kGjhE-0000Hq-6V for qemu-devel@nongnu.org; Fri, 11 Sep 2020 10:06:37 -0400 Received: by mail-pg1-x542.google.com with SMTP id y1so421933pgk.8 for ; Fri, 11 Sep 2020 07:06:35 -0700 (PDT) Received: from localhost.localdomain (211-23-39-77.HINET-IP.hinet.net. [211.23.39.77]) by smtp.googlemail.com with ESMTPSA id y5sm2203179pge.62.2020.09.11.07.06.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 07:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qnap.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PuHXsiU+oecnkGPtxK75s3vxc3sJrd16mO4Uu96aLyk=; b=MJz0jshQhaC2jQqeHHma0+tTbBKfOx0y1LfZldKq+1aornWXILLQwqoC5/UZooPa9V aivMItigVkM5ps+CugCDf/IAC301w46hNYCEhfM7b+RNOkEU9rJmtSAHp02PSV6lg73A efIpF656OrEIRBnOQwrHEX9X4YvwcGKqB4ds0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PuHXsiU+oecnkGPtxK75s3vxc3sJrd16mO4Uu96aLyk=; b=PvV5VbyFp6ro24ZQehuHa30AwUmiO1jPBRybGGc5Vsf21/+qwJ86V0mdNtMLMKBfen cJGlrt+bcdqSvlBYe/iFnhiS0jMqIfa+36s0NsXhG+8hU78KrCpII6P8b4mWrQQHQifX T0YBI5gIao1G03/XZ4wOzXKIvizbOrNGdsyKu2hQvdjA6j6KgN0nL0aRYRSPqeObzUAj tg61kx+7F7R2r4AszwnnzI7Y0hgW1tUdj7hM8rOr4yzqlcDv3zoYL61mGU6wbhY9rZs9 emKn9odkf6qdljGdod1fQMgBvmA8n5PuDP+LGqZsIHarjcUficY4zvT+jHI8wgRdJrtx 6DLA== X-Gm-Message-State: AOAM53272MV+WMyCCv5D+8odDu81E1inmeJE4zflUwljklNZ8r9QlVwh wcPL5ddL546Bk/oYhqAqEp6jBvjPpQrh4ClP X-Google-Smtp-Source: ABdhPJwih9I8ju+wpcTvzNlls2UwqN9akI1zGNyPmoh+psPGXx5DOjM77PucWEIkf2il+NgNMnIU9Q== X-Received: by 2002:a17:902:8bc2:b029:d0:cbe1:e743 with SMTP id r2-20020a1709028bc2b02900d0cbe1e743mr2508603plo.30.1599833194567; Fri, 11 Sep 2020 07:06:34 -0700 (PDT) From: Derek Su To: qemu-devel@nongnu.org Subject: [PATCH v1 2/2] colo-compare: Record packet creation time by QEMU_CLOCK_REALTIME Date: Fri, 11 Sep 2020 19:05:08 +0000 Message-Id: <20200911190508.1316487-3-dereksu@qnap.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200911190508.1316487-1-dereksu@qnap.com> References: <20200911190508.1316487-1-dereksu@qnap.com> 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::542; envelope-from=dereksu@qnap.com; helo=mail-pg1-x542.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 43 X-Spam_score: 4.3 X-Spam_bar: ++++ X-Spam_report: (4.3 / 5.0 requ) BAYES_00=-1.9, DATE_IN_FUTURE_03_06=3.027, 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Derek Su , chen.zhang@intel.com, jasowang@redhat.com, lizhijian@cn.fujitsu.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Record packet creation time by QEMU_CLOCK_REALTIME instead of QEMU_CLOCK_HOST. The time difference between `now` and packet `creation_ms` has the possibility of an unexpected negative value and results in wrong comparison after changing the host clock. Signed-off-by: Derek Su --- net/colo-compare.c | 2 +- net/colo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index c4de86ef34..29d7f986e3 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -621,7 +621,7 @@ static int colo_packet_compare_other(Packet *spkt, Pack= et *ppkt) =20 static int colo_old_packet_check_one(Packet *pkt, void *user_data) { - int64_t now =3D qemu_clock_get_ms(QEMU_CLOCK_HOST); + int64_t now =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); uint32_t check_time =3D *(uint32_t *)user_data; =20 if ((now - pkt->creation_ms) > check_time) { diff --git a/net/colo.c b/net/colo.c index a6c66d829a..0441910169 100644 --- a/net/colo.c +++ b/net/colo.c @@ -164,7 +164,7 @@ Packet *packet_new(const void *data, int size, int vnet= _hdr_len) =20 pkt->data =3D g_memdup(data, size); pkt->size =3D size; - pkt->creation_ms =3D qemu_clock_get_ms(QEMU_CLOCK_HOST); + pkt->creation_ms =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); pkt->vnet_hdr_len =3D vnet_hdr_len; pkt->tcp_seq =3D 0; pkt->tcp_ack =3D 0; --=20 2.25.1