From nobody Sun Feb 8 01:39:29 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BC25C77B61 for ; Thu, 13 Apr 2023 06:41:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229902AbjDMGll (ORCPT ); Thu, 13 Apr 2023 02:41:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229845AbjDMGld (ORCPT ); Thu, 13 Apr 2023 02:41:33 -0400 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 5ED938A58 for ; Wed, 12 Apr 2023 23:40:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681368048; 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=WTB3CgJRk7J5IzkSOYPigSPFDZTD53vvUVJW3ncH3HA=; b=GceBONcl/ryI8DyMdPXrzKfGaMsWQsq//v0dQh8OOj6j6AK4qa1FDrHxGezsQnHUVAAurl nkBXLs1rKLpPwCgrlQap8MLP93P1TBtg6GknDrXjfdnHZHD45o/QIQ+VJXw7BoiM6AN9lM rk8dMqHBMbS4Tda82JeuLh0X4JMfOiY= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-411-tcTRVZCjPderlQhfr7Cpkg-1; Thu, 13 Apr 2023 02:40:42 -0400 X-MC-Unique: tcTRVZCjPderlQhfr7Cpkg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5B6823C1068B; Thu, 13 Apr 2023 06:40:42 +0000 (UTC) Received: from localhost.localdomain (ovpn-12-72.pek2.redhat.com [10.72.12.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id B878B40C6E20; Thu, 13 Apr 2023 06:40:36 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, maxime.coquelin@redhat.com, alvaro.karsz@solid-run.com, eperezma@redhat.com, xuanzhuo@linux.alibaba.com, david.marchand@redhat.com Subject: [PATCH net-next V2 1/2] virtio-net: convert rx mode setting to use workqueue Date: Thu, 13 Apr 2023 14:40:26 +0800 Message-Id: <20230413064027.13267-2-jasowang@redhat.com> In-Reply-To: <20230413064027.13267-1-jasowang@redhat.com> References: <20230413064027.13267-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch convert rx mode setting to be done in a workqueue, this is a must for allow to sleep when waiting for the cvq command to response since current code is executed under addr spin lock. Signed-off-by: Jason Wang Tested-by: Maxime Coquelin --- Changes since V1: - use RTNL to synchronize rx mode worker --- drivers/net/virtio_net.c | 55 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index e2560b6f7980..2e56bbf86894 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -265,6 +265,12 @@ struct virtnet_info { /* Work struct for config space updates */ struct work_struct config_work; =20 + /* Work struct for config rx mode */ + struct work_struct rx_mode_work; + + /* Is rx mode work enabled? */ + bool rx_mode_work_enabled; + /* Does the affinity hint is set for virtqueues? */ bool affinity_hint_set; =20 @@ -388,6 +394,20 @@ static void disable_delayed_refill(struct virtnet_info= *vi) spin_unlock_bh(&vi->refill_lock); } =20 +static void enable_rx_mode_work(struct virtnet_info *vi) +{ + rtnl_lock(); + vi->rx_mode_work_enabled =3D true; + rtnl_unlock(); +} + +static void disable_rx_mode_work(struct virtnet_info *vi) +{ + rtnl_lock(); + vi->rx_mode_work_enabled =3D false; + rtnl_unlock(); +} + static void virtqueue_napi_schedule(struct napi_struct *napi, struct virtqueue *vq) { @@ -2310,9 +2330,11 @@ static int virtnet_close(struct net_device *dev) return 0; } =20 -static void virtnet_set_rx_mode(struct net_device *dev) +static void virtnet_rx_mode_work(struct work_struct *work) { - struct virtnet_info *vi =3D netdev_priv(dev); + struct virtnet_info *vi =3D + container_of(work, struct virtnet_info, rx_mode_work); + struct net_device *dev =3D vi->dev; struct scatterlist sg[2]; struct virtio_net_ctrl_mac *mac_data; struct netdev_hw_addr *ha; @@ -2325,6 +2347,8 @@ static void virtnet_set_rx_mode(struct net_device *de= v) if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_RX)) return; =20 + rtnl_lock(); + vi->ctrl->promisc =3D ((dev->flags & IFF_PROMISC) !=3D 0); vi->ctrl->allmulti =3D ((dev->flags & IFF_ALLMULTI) !=3D 0); =20 @@ -2342,14 +2366,19 @@ static void virtnet_set_rx_mode(struct net_device *= dev) dev_warn(&dev->dev, "Failed to %sable allmulti mode.\n", vi->ctrl->allmulti ? "en" : "dis"); =20 + netif_addr_lock_bh(dev); + uc_count =3D netdev_uc_count(dev); mc_count =3D netdev_mc_count(dev); /* MAC filter - use one buffer for both lists */ buf =3D kzalloc(((uc_count + mc_count) * ETH_ALEN) + (2 * sizeof(mac_data->entries)), GFP_ATOMIC); mac_data =3D buf; - if (!buf) + if (!buf) { + netif_addr_unlock_bh(dev); + rtnl_unlock(); return; + } =20 sg_init_table(sg, 2); =20 @@ -2370,6 +2399,8 @@ static void virtnet_set_rx_mode(struct net_device *de= v) netdev_for_each_mc_addr(ha, dev) memcpy(&mac_data->macs[i++][0], ha->addr, ETH_ALEN); =20 + netif_addr_unlock_bh(dev); + sg_set_buf(&sg[1], mac_data, sizeof(mac_data->entries) + (mc_count * ETH_ALEN)); =20 @@ -2377,9 +2408,19 @@ static void virtnet_set_rx_mode(struct net_device *d= ev) VIRTIO_NET_CTRL_MAC_TABLE_SET, sg)) dev_warn(&dev->dev, "Failed to set MAC filter table.\n"); =20 + rtnl_unlock(); + kfree(buf); } =20 +static void virtnet_set_rx_mode(struct net_device *dev) +{ + struct virtnet_info *vi =3D netdev_priv(dev); + + if (vi->rx_mode_work_enabled) + schedule_work(&vi->rx_mode_work); +} + static int virtnet_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid) { @@ -3150,6 +3191,8 @@ static void virtnet_freeze_down(struct virtio_device = *vdev) =20 /* Make sure no work handler is accessing the device */ flush_work(&vi->config_work); + disable_rx_mode_work(vi); + flush_work(&vi->rx_mode_work); =20 netif_tx_lock_bh(vi->dev); netif_device_detach(vi->dev); @@ -3172,6 +3215,7 @@ static int virtnet_restore_up(struct virtio_device *v= dev) virtio_device_ready(vdev); =20 enable_delayed_refill(vi); + enable_rx_mode_work(vi); =20 if (netif_running(vi->dev)) { err =3D virtnet_open(vi->dev); @@ -3969,6 +4013,7 @@ static int virtnet_probe(struct virtio_device *vdev) vdev->priv =3D vi; =20 INIT_WORK(&vi->config_work, virtnet_config_changed_work); + INIT_WORK(&vi->rx_mode_work, virtnet_rx_mode_work); spin_lock_init(&vi->refill_lock); =20 if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) { @@ -4077,6 +4122,8 @@ static int virtnet_probe(struct virtio_device *vdev) if (vi->has_rss || vi->has_rss_hash_report) virtnet_init_default_rss(vi); =20 + enable_rx_mode_work(vi); + /* serialize netdev register + virtio_device_ready() with ndo_open() */ rtnl_lock(); =20 @@ -4174,6 +4221,8 @@ static void virtnet_remove(struct virtio_device *vdev) =20 /* Make sure no work handler is accessing the device. */ flush_work(&vi->config_work); + disable_rx_mode_work(vi); + flush_work(&vi->rx_mode_work); =20 unregister_netdev(vi->dev); =20 --=20 2.25.1 From nobody Sun Feb 8 01:39:29 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70CF1C77B6C for ; Thu, 13 Apr 2023 06:41:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229591AbjDMGlr (ORCPT ); Thu, 13 Apr 2023 02:41:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229876AbjDMGlj (ORCPT ); Thu, 13 Apr 2023 02:41:39 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFCF683FE for ; Wed, 12 Apr 2023 23:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681368050; 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=gpLT5R5/zK3cbjxkCACuzxBqVGqeFsHPUxNqi6hiv3s=; b=GF+F6+SXmlotNN14FvAjzyJwKeYvCpA7yOYCh+EJbaWfYxGxUbxgw8Vfyu5sVuLmWvAZDm 95G7iC3jZbt8sFfNPdJLBOx5lJad5Zvkl7kY52bNlQ36q0WnV+nJYSfeO1IHTciwcbzRJj DTPdOQ3Fe4rF9JceGvuDNix1V0f3B0I= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-152-BOUUWfWAONeJnvX6gK18fg-1; Thu, 13 Apr 2023 02:40:49 -0400 X-MC-Unique: BOUUWfWAONeJnvX6gK18fg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AD9DE3C025B3; Thu, 13 Apr 2023 06:40:48 +0000 (UTC) Received: from localhost.localdomain (ovpn-12-72.pek2.redhat.com [10.72.12.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20C6140C6F87; Thu, 13 Apr 2023 06:40:42 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, maxime.coquelin@redhat.com, alvaro.karsz@solid-run.com, eperezma@redhat.com, xuanzhuo@linux.alibaba.com, david.marchand@redhat.com Subject: [PATCH net-next V2 2/2] virtio-net: sleep instead of busy waiting for cvq command Date: Thu, 13 Apr 2023 14:40:27 +0800 Message-Id: <20230413064027.13267-3-jasowang@redhat.com> In-Reply-To: <20230413064027.13267-1-jasowang@redhat.com> References: <20230413064027.13267-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" We used to busy waiting on the cvq command this tends to be problematic since there no way for to schedule another process which may serve for the control virtqueue. This might be the case when the control virtqueue is emulated by software. This patch switches to use completion to allow the CPU to sleep instead of busy waiting for the cvq command. Signed-off-by: Jason Wang Tested-by: Maxime Coquelin --- Changes since V1: - use completion for simplicity - don't try to harden the CVQ command which requires more thought Changes since RFC: - break the device when timeout - get buffer manually since the virtio core check more_used() instead --- drivers/net/virtio_net.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 2e56bbf86894..d3eb8fd6c9dc 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -295,6 +296,8 @@ struct virtnet_info { =20 /* failover when STANDBY feature enabled */ struct failover *failover; + + struct completion completion; }; =20 struct padded_vnet_hdr { @@ -1709,6 +1712,13 @@ static bool try_fill_recv(struct virtnet_info *vi, s= truct receive_queue *rq, return !oom; } =20 +static void virtnet_cvq_done(struct virtqueue *cvq) +{ + struct virtnet_info *vi =3D cvq->vdev->priv; + + complete(&vi->completion); +} + static void skb_recv_done(struct virtqueue *rvq) { struct virtnet_info *vi =3D rvq->vdev->priv; @@ -2169,12 +2179,8 @@ static bool virtnet_send_command(struct virtnet_info= *vi, u8 class, u8 cmd, if (unlikely(!virtqueue_kick(vi->cvq))) return vi->ctrl->status =3D=3D VIRTIO_NET_OK; =20 - /* Spin for a response, the kick causes an ioport write, trapping - * into the hypervisor, so the request should be handled immediately. - */ - while (!virtqueue_get_buf(vi->cvq, &tmp) && - !virtqueue_is_broken(vi->cvq)) - cpu_relax(); + wait_for_completion(&vi->completion); + virtqueue_get_buf(vi->cvq, &tmp); =20 return vi->ctrl->status =3D=3D VIRTIO_NET_OK; } @@ -3672,7 +3678,7 @@ static int virtnet_find_vqs(struct virtnet_info *vi) =20 /* Parameters for control virtqueue, if any */ if (vi->has_cvq) { - callbacks[total_vqs - 1] =3D NULL; + callbacks[total_vqs - 1] =3D virtnet_cvq_done; names[total_vqs - 1] =3D "control"; } =20 @@ -4122,6 +4128,7 @@ static int virtnet_probe(struct virtio_device *vdev) if (vi->has_rss || vi->has_rss_hash_report) virtnet_init_default_rss(vi); =20 + init_completion(&vi->completion); enable_rx_mode_work(vi); =20 /* serialize netdev register + virtio_device_ready() with ndo_open() */ --=20 2.25.1