From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C832208D5 for ; Thu, 12 Oct 2023 09:13:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bIPkrXSa" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D7FB170F for ; Thu, 12 Oct 2023 02:13:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697101998; 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=LilWhAMwJSNCjqPLdL8lOODHHHbgf2yQ5atXlvOll+E=; b=bIPkrXSa8j0nwxDTVN5NFrfVU6nOCSaQyCKHFAaQz0HO/8vfXYaPdsjFVk8fOnxF4icd+A Uts1fd0k71+zk/F03VNm7p5xfZK5sMQ4eNZ1Q/6VVs749+n+lhSvN5FA+2UavRCozjWlM0 zEgROotJCkeEmRoHnhS9nB0cchyFUo4= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-593-7eB1p_4hPyeJldsYO4iSog-1; Thu, 12 Oct 2023 05:13:16 -0400 X-MC-Unique: 7eB1p_4hPyeJldsYO4iSog-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3251bc06680so509710f8f.2 for ; Thu, 12 Oct 2023 02:13:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697101995; x=1697706795; 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=LilWhAMwJSNCjqPLdL8lOODHHHbgf2yQ5atXlvOll+E=; b=ogj0gI8TL1v5ty4f0mmfP58CxKHEwfVx/05arlBWUfyTjRy68h3UsQJReHfsJS+0+J QzWXuDOjpcNREcP0A9ezDHgN/kGOr/YtoFzNU6nHQ9HfxX3LXaofLJyXP2nQ+Itk6oGH 6QKN2bytR19BH7XiYnF7IEN8CBinnw0Ao7KzhW3BB/QEXtdDDLUZMdUyHzcTfStCqiy3 RWpomuaEzn6Mcqk6+mi9W9bUYjGD1Vg8HuUgn6+NTzQGNSWvJZs33IskhYvAQeHLiS6v XUwJQ0BwZeQxjfLwBBC7av9YpoCQfxad3fxhA4ovCiqy0LPsnWCBgHP3vhioTrGpkqvV mQUQ== X-Gm-Message-State: AOJu0YzY6bo7wCqVV8xnnWyM7KURNwidl4Ol58guBd4fycLtDOXZ58p5 cnx99fLR8u3Hwzoq+EQfMixWk9qnNO5qX9W2UxJezJR1X0JMzEJCJyOmAjgSEvblTbeag5SKV63 yFwkgH1qPzBXiQbj9MU8BoI6+ X-Received: by 2002:adf:f9cc:0:b0:31f:98b4:4b62 with SMTP id w12-20020adff9cc000000b0031f98b44b62mr18218359wrr.37.1697101995344; Thu, 12 Oct 2023 02:13:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSpW0SO/rNFTY5n3WpVsZ+/7XSDbtL1/d1JpDZJXFSNm6HWBH1Ut8sxrQgkbB6ePpIfifh1w== X-Received: by 2002:adf:f9cc:0:b0:31f:98b4:4b62 with SMTP id w12-20020adff9cc000000b0031f98b44b62mr18218327wrr.37.1697101995005; Thu, 12 Oct 2023 02:13:15 -0700 (PDT) Received: from redhat.com ([2a06:c701:73d2:bf00:e379:826:5137:6b23]) by smtp.gmail.com with ESMTPSA id t9-20020a05600001c900b0032179c4a46dsm17807510wrx.100.2023.10.12.02.13.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 02:13:14 -0700 (PDT) Date: Thu, 12 Oct 2023 05:13:11 -0400 From: "Michael S. Tsirkin" To: Xuan Zhuo Cc: virtualization@lists.linux-foundation.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jason Wang , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: Re: [PATCH vhost 08/22] virtio_net: virtnet_poll_tx support rescheduled Message-ID: <20231012051159-mutt-send-email-mst@kernel.org> References: <20231011092728.105904-1-xuanzhuo@linux.alibaba.com> <20231011092728.105904-9-xuanzhuo@linux.alibaba.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231011092728.105904-9-xuanzhuo@linux.alibaba.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net On Wed, Oct 11, 2023 at 05:27:14PM +0800, Xuan Zhuo wrote: > virtnet_poll_tx() support to return budget when busy to be rescheduled. > > When retval < budget, napi_poll() in dev.c will exit directly. And > virtqueue_napi_complete() will be called to close napi. > > When retval == budget, the napi_poll() in dev.c will re-add napi to the > queue. > > The purpose of this patch is to support xsk xmit in virtio_poll_tx() for > subsequent patch. > > Signed-off-by: Xuan Zhuo > --- > drivers/net/virtio/main.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c > index bcfd31a55076..f32cfa189972 100644 > --- a/drivers/net/virtio/main.c > +++ b/drivers/net/virtio/main.c > @@ -1976,6 +1976,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) > struct virtnet_info *vi = sq->vq->vdev->priv; > unsigned int index = vq2txq(sq->vq); > struct netdev_queue *txq; > + int busy = 0; > int opaque; > bool done; > > @@ -1993,6 +1994,11 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) > if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS) > netif_tx_wake_queue(txq); > > + if (busy) { > + __netif_tx_unlock(txq); > + return budget; > + } > + > opaque = virtqueue_enable_cb_prepare(sq->vq); > > done = napi_complete_done(napi, 0); This just adds a bit of dead code. Pls just squash into that patch. > -- > 2.32.0.3.g01195cf9f