From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5577FC52D7C for ; Tue, 13 Aug 2024 20:49:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sdySe-0000vt-0y; Tue, 13 Aug 2024 16:49:44 -0400 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 1sdySb-0000lw-MS for qemu-riscv@nongnu.org; Tue, 13 Aug 2024 16:49:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sdySZ-0001fu-QY for qemu-riscv@nongnu.org; Tue, 13 Aug 2024 16:49:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723582179; 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=2jyXx+wKOQOxU2ecyqA2iwoYFri7dVNuVaZYwSPMvZE=; b=iV92+xvQsGNULc0/FCrXMgSLbaxiUD06JlE4nVVVjphQTPNZpq5jrTq+CyUL8qFiReiBcQ uGLdAC8AvJ9CI4UQdURtleq+cYUFp2BgS4RtodHAlylGOWJ5T2+Y/Xb9wDAQsOeesAtoOB GUCsIBBiaJdkCaNCtAc7NBo0KHFi4po= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-142-9fv5dSJfMv2ZCakHjk_-dg-1; Tue, 13 Aug 2024 16:49:36 -0400 X-MC-Unique: 9fv5dSJfMv2ZCakHjk_-dg-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5b122f40f64so4594979a12.3 for ; Tue, 13 Aug 2024 13:49:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723582175; x=1724186975; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2jyXx+wKOQOxU2ecyqA2iwoYFri7dVNuVaZYwSPMvZE=; b=dFPmRbDv26gIv+h2wZHAFLLTyj6wyI4CKV0ocNcIhVKGbVEsR/BaWLDeu2UdUTZYKE mQmwaXgCsDys3vbp64/tzL3ldOCHE/LMjEVaUkBdFJ21n14GV8/LxI1qqIHLJHTC4NvG vsQHdehmtYIX1dDBx0LBtj3Qp7p+DsYn1Oxno6yY9V6sgP0hSpzBOV5r+Pc23Ox2DqvN XCn3TB40Fpyd7auXbAtppmKDi4sY4mbugLUI5blAGLzuJmlS2jRp3G9LuXisX9oGpkra 4tCj3kwDr4ViXgEVhjgVkk2yqaoMyGg3XqF5H1NjdTOeW2SaHwv36t7C2Xwxv0m0e4nU 1dzw== X-Forwarded-Encrypted: i=1; AJvYcCWoGD0C4x7F3mIrfs0j/009ZecfotkEbTW7cRl8xIhBZOojJy2rqkhZik+xb9MpzMTveIdjnz0gZ+Ex@nongnu.org X-Gm-Message-State: AOJu0YzGDcAqbt4gS/OQoFBjdR1lY9yeyFnIsBGeq+Uxnk8YJdX6x0vU 5MaQC2znYVaUwcj2ZXILZzZ6xdAbWORvCATkSte1oWxJ5wIBvugNOzIaYYEUeU1QTCxO0b1spwx OjlljcVLJaQrV0+RQShHoKoEjFbvjLbLr7KM8XfXFemONlwwMmus3 X-Received: by 2002:a05:6402:354d:b0:5a2:eeeb:9470 with SMTP id 4fb4d7f45d1cf-5bea1c7d55cmr495886a12.18.1723582175640; Tue, 13 Aug 2024 13:49:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFOThsCAJZvMWhFXkmvc33CnN7/gHIhcFcd6plNLIQ7t1uElLb+9qnrCat3ar5DTPcCAzlaCA== X-Received: by 2002:a05:6402:354d:b0:5a2:eeeb:9470 with SMTP id 4fb4d7f45d1cf-5bea1c7d55cmr495846a12.18.1723582174803; Tue, 13 Aug 2024 13:49:34 -0700 (PDT) Received: from redhat.com ([2a0d:6fc7:346:dcde:9c09:aa95:551d:d374]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5bd1a602115sm3148299a12.96.2024.08.13.13.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 13:49:34 -0700 (PDT) Date: Tue, 13 Aug 2024 16:49:24 -0400 From: "Michael S. Tsirkin" To: Alex =?iso-8859-1?Q?Benn=E9e?= Cc: qemu-devel@nongnu.org, Alistair Francis , Michael Roth , Palmer Dabbelt , Mahmoud Mandour , Pavel Dovgalyuk , Yoshinori Sato , Weiwei Li , Eduardo Habkost , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Markus Armbruster , David Hildenbrand , Beraldo Leal , Liu Zhiwei , Eric Auger , Song Gao , qemu-arm@nongnu.org, Peter Xu , Jiri Pirko , Eric Blake , Fabiano Rosas , qemu-s390x@nongnu.org, Peter Maydell , Daniel Henrique Barboza , John Snow , Alexandre Iooss , Konstantin Kostiuk , Pierrick Bouvier , Cleber Rosa , Ilya Leoshkevich , qemu-riscv@nongnu.org, Thomas Huth , Paolo Bonzini , Richard Henderson , Jason Wang , Bin Meng , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Wainer dos Santos Moschetta , Nicholas Piggin Subject: Re: [PATCH v2 17/21] virtio-net: Use virtual time for RSC timers Message-ID: <20240813164916-mutt-send-email-mst@kernel.org> References: <20240813202329.1237572-1-alex.bennee@linaro.org> <20240813202329.1237572-18-alex.bennee@linaro.org> MIME-Version: 1.0 In-Reply-To: <20240813202329.1237572-18-alex.bennee@linaro.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.125, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@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-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org On Tue, Aug 13, 2024 at 09:23:25PM +0100, Alex Bennée wrote: > From: Nicholas Piggin > > Receive coalescing is visible to the target machine, so its timers > should use virtual time like other timers in virtio-net, to be > compatible with record-replay. > > Signed-off-by: Nicholas Piggin > Message-Id: <20240813050638.446172-10-npiggin@gmail.com> > Signed-off-by: Alex Bennée Acked-by: Michael S. Tsirkin > --- > hw/net/virtio-net.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index 10ebaae5e2..ed33a32877 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -2124,7 +2124,7 @@ static void virtio_net_rsc_purge(void *opq) > chain->stat.timer++; > if (!QTAILQ_EMPTY(&chain->buffers)) { > timer_mod(chain->drain_timer, > - qemu_clock_get_ns(QEMU_CLOCK_HOST) + chain->n->rsc_timeout); > + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + chain->n->rsc_timeout); > } > } > > @@ -2360,7 +2360,7 @@ static size_t virtio_net_rsc_do_coalesce(VirtioNetRscChain *chain, > chain->stat.empty_cache++; > virtio_net_rsc_cache_buf(chain, nc, buf, size); > timer_mod(chain->drain_timer, > - qemu_clock_get_ns(QEMU_CLOCK_HOST) + chain->n->rsc_timeout); > + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + chain->n->rsc_timeout); > return size; > } > > @@ -2598,7 +2598,7 @@ static VirtioNetRscChain *virtio_net_rsc_lookup_chain(VirtIONet *n, > chain->max_payload = VIRTIO_NET_MAX_IP6_PAYLOAD; > chain->gso_type = VIRTIO_NET_HDR_GSO_TCPV6; > } > - chain->drain_timer = timer_new_ns(QEMU_CLOCK_HOST, > + chain->drain_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, > virtio_net_rsc_purge, chain); > memset(&chain->stat, 0, sizeof(chain->stat)); > > -- > 2.39.2