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 A7E31C05027 for ; Sun, 29 Jan 2023 07:26:12 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pM24Y-0002o2-4r; Sun, 29 Jan 2023 02:25:54 -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 1pM24W-0002nT-M3 for qemu-devel@nongnu.org; Sun, 29 Jan 2023 02:25:52 -0500 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 1pM24U-0006rv-Va for qemu-devel@nongnu.org; Sun, 29 Jan 2023 02:25:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674977149; 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: in-reply-to:in-reply-to:references:references; bh=fi0K2pxyiikJIKP4Qi4jr3BbdBYSFvmxLVKh+ZlQbmI=; b=Pv7bKjgvkoWHrH4z12M6qHTgxal4b3XqzLZLPeNjwkVRrA84mSfXbXuf4qGRm+pi25vCrI 9ip/P4kejutHINHjvkqB0D+3GoSjOcHMVhhuSTJhMtmk2m/9H734Qs/+Wkf8R5trDsDvcl tFabvgeoIU4xJwzJwI7xxhje8NZ/z2w= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-646-HAVt8ky1MaqRinesu9SpzQ-1; Sun, 29 Jan 2023 02:25:48 -0500 X-MC-Unique: HAVt8ky1MaqRinesu9SpzQ-1 Received: by mail-wm1-f69.google.com with SMTP id o5-20020a05600c4fc500b003db0b3230efso7362455wmq.9 for ; Sat, 28 Jan 2023 23:25:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to: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=fi0K2pxyiikJIKP4Qi4jr3BbdBYSFvmxLVKh+ZlQbmI=; b=be9pvZ3z6KRHglq8gPOfZhJdE78SNpayNDImpyClz1nXDvuWF90QVBxhFNbacVzvd3 oCwub6kHgEhtpsnPf9BIU/+pGLtDqokW68dnONj8iHdXDxXIrs7lbPmYWdqwRIFXccWW ACWga+jgNoT9NH7CboVcNC7Twk1HjTMere+4CKgdgcypY1+Zv1MDRDzCnetUs9LEBsAN fgKVuUKjm6P0qKMh5VQ2sAoMJQfxbbKMo/9YcV9G8Wlu+CEWGk+mKwZsZp4CxDe2NGYM UsGqRM6OthtaNjMwkEMKSbiJyJvZg+6vii5sHfP3hDgw4xpAIYg8uRDsTwYj2C2vltT5 /whQ== X-Gm-Message-State: AO0yUKWoDanDMl96HSgifVTaP1RUwVRgZoWoW8qDCWtTCnAui3vHBPng MeVuKMfDeC3qEtZBQjn41U8LQWpGElbcZ17o/Uq8uP+bsSb7ihQxxkqNKmxGIWkLD4KZt8Yq3wB jP7kiFkJaVW9OtHY= X-Received: by 2002:adf:ea4a:0:b0:2bf:baf3:b5c with SMTP id j10-20020adfea4a000000b002bfbaf30b5cmr12884592wrn.48.1674977146902; Sat, 28 Jan 2023 23:25:46 -0800 (PST) X-Google-Smtp-Source: AK7set/cOU7vnjq4h55r5XhhiS8lzqwCAXBlFkNY2i/Dqth+RKKmxb1KxDXvHb3MIAp+Q86ESNt5ww== X-Received: by 2002:adf:ea4a:0:b0:2bf:baf3:b5c with SMTP id j10-20020adfea4a000000b002bfbaf30b5cmr12884583wrn.48.1674977146687; Sat, 28 Jan 2023 23:25:46 -0800 (PST) Received: from redhat.com ([2.52.20.248]) by smtp.gmail.com with ESMTPSA id c7-20020adfe707000000b002bfb0c5527esm8386136wrm.109.2023.01.28.23.25.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jan 2023 23:25:46 -0800 (PST) Date: Sun, 29 Jan 2023 02:25:43 -0500 From: "Michael S. Tsirkin" To: Xuan Zhuo Cc: qemu-devel@nongnu.org, Jason Wang , Alexander Bulekov Subject: Re: [PATCH v1 2/2] virtio-net: virtio_net_flush_tx() check for per-queue reset Message-ID: <20230129021402-mutt-send-email-mst@kernel.org> References: <20230129025150.119972-1-xuanzhuo@linux.alibaba.com> <20230129025150.119972-3-xuanzhuo@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230129025150.119972-3-xuanzhuo@linux.alibaba.com> 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: -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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Sun, Jan 29, 2023 at 10:51:50AM +0800, Xuan Zhuo wrote: > Check whether it is per-queue reset state in virtio_net_flush_tx(). > > Before per-queue reset, we need to recover async tx resources. At this > time, virtio_net_flush_tx() is called, but we should not try to send > new packets, so virtio_net_flush_tx() should check the current > per-queue reset state. What does "at this time" mean here? Do you in fact mean it's called from flush_or_purge_queued_packets? What does the call stack look like? If yes introducing a vq state just so virtio_net_flush_tx knows we are in the process of reset would be a bad idea. We want something much more local, ideally on stack even ... > > Fixes: 7dc6be52 ("virtio-net: support queue reset") > Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1451 > Reported-by: Alexander Bulekov > Signed-off-by: Xuan Zhuo > --- > hw/net/virtio-net.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index 3ae909041a..fba6451a50 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -2627,7 +2627,8 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q) > VirtQueueElement *elem; > int32_t num_packets = 0; > int queue_index = vq2q(virtio_get_queue_index(q->tx_vq)); > - if (!(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK)) { > + if (!(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) || > + virtio_queue_reset_state(q->tx_vq)) { > return num_packets; > } > > -- > 2.32.0.3.g01195cf9f