From patchwork Mon Dec 26 07:49:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 36555 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp795279wrt; Sun, 25 Dec 2022 23:52:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXuJc88+H/6TtOKFvyOrawWkK2m/XT5ZSEozjU+izcinHYTmzJZZwfe09SXhNFs3tmSyextE X-Received: by 2002:a17:906:b041:b0:838:fabb:40b2 with SMTP id bj1-20020a170906b04100b00838fabb40b2mr14218603ejb.32.1672041173811; Sun, 25 Dec 2022 23:52:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672041173; cv=none; d=google.com; s=arc-20160816; b=Bn6A9poXHti7pFDMuu8iaXcrDgjIM0hqp3XIOSlEaWeoXtrZOAdYfpOCbNsjuBEuCU OhstGNDWF/J9HYoQ8G2W8jeEcgqU+u12FExhFLxjac+uLSa7ztc6X7+d9eMXCLpSGJas h0MdW08xtQtcFVxGfS+i4mTK31T28bU1+TFJnExY+2LRvb3h9tovqO50h699U8Itw73S AYcE2j83eTqG4wIw25QA7ks7FJlwdx1+XAEMJaAL68nYNpjuvG3nYn/xPQS5AUwxA1Z5 MS9t9R35BbTBmkpVVyEDeJ0Ie7iIytA76Ty0xJ+yI9+aw7YnfWvLTH0fzTtSf786nwX6 Er1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=izBQcDXRjlNbfrqUhUbxJNlz9mzMYpLOJS7BO6ADrsA=; b=e8bCV+aC0+sexxQBfuAiX3LIwDyFekxucSPSIwjs8qehElFxVSuINjEtiT6SIlx+qT mqAB7i+/3MXR7qjFh54lkScTdcITmNfZCaVuWgFj5Pn9E4gG0pLsHLBQiRz7lLKPG9iK aIq7RxyPQpty0FBk+rMZdPKoVrNKTPrKJs6wP9h+eM6kArcpJdU+NPUf3Q8jPGkNFr24 PyuguuRPhIS8TRAVWLPk7maTszCghG+Y1XNNf7N+hsAuXpYzE+Kj8eiH4dAS//8BO6N3 m1rbyHyg1mbICaBzavQ2HalkeGHer+asfAbUklZP0bx3V2OtnMGrhxZCy3rZhTWV34MP 3t/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iEWPWlcm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fy15-20020a1709069f0f00b0080a15fe49bfsi6340763ejc.896.2022.12.25.23.52.30; Sun, 25 Dec 2022 23:52:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iEWPWlcm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231772AbiLZHuk (ORCPT + 99 others); Mon, 26 Dec 2022 02:50:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231769AbiLZHuQ (ORCPT ); Mon, 26 Dec 2022 02:50:16 -0500 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 B82D46146 for ; Sun, 25 Dec 2022 23:49:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672040967; 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=izBQcDXRjlNbfrqUhUbxJNlz9mzMYpLOJS7BO6ADrsA=; b=iEWPWlcmtePyUcHaRJq2jpYI2aqodRzcZcNJYi2wIIq5pu/s0lbnVTkUWC/No7oIDGt6oD s1/BZIzST5sluGD1JTUTnxrcgJRw/zJgOEhMkqhV7qy3iEBnuAZ7gM6FxRiSy2dCByB5oM 6NY01+kaILb/4ifIstmkh1WEqoPJACQ= 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-74-ZJWa1mhENqKjQGQCishvyg-1; Mon, 26 Dec 2022 02:49:20 -0500 X-MC-Unique: ZJWa1mhENqKjQGQCishvyg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 832542A5956E; Mon, 26 Dec 2022 07:49:20 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-100.pek2.redhat.com [10.72.13.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C11D1492B00; Mon, 26 Dec 2022 07:49:15 +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, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, maxime.coquelin@redhat.com, alvaro.karsz@solid-run.com, eperezma@redhat.com Subject: [PATCH 1/4] virtio-net: convert rx mode setting to use workqueue Date: Mon, 26 Dec 2022 15:49:05 +0800 Message-Id: <20221226074908.8154-2-jasowang@redhat.com> In-Reply-To: <20221226074908.8154-1-jasowang@redhat.com> References: <20221226074908.8154-1-jasowang@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753262245975989684?= X-GMAIL-MSGID: =?utf-8?q?1753262245975989684?= 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 --- drivers/net/virtio_net.c | 66 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 86e52454b5b5..efd9dd55828b 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -260,6 +260,15 @@ struct virtnet_info { /* Work struct for config space updates */ struct work_struct config_work; + /* Work struct for config rx mode */ + struct work_struct rx_mode_work; + + /* Is rx_mode_work enabled? */ + bool rx_mode_work_enabled; + + /* The lock to synchronize the access to refill_enabled */ + spinlock_t rx_mode_lock; + /* Does the affinity hint is set for virtqueues? */ bool affinity_hint_set; @@ -383,6 +392,22 @@ static void disable_delayed_refill(struct virtnet_info *vi) spin_unlock_bh(&vi->refill_lock); } +static void enable_rx_mode_work(struct virtnet_info *vi) +{ + spin_lock_bh(&vi->rx_mode_lock); + vi->rx_mode_work_enabled = true; + spin_unlock_bh(&vi->rx_mode_lock); +} + +static void disable_rx_mode_work(struct virtnet_info *vi) +{ + spin_lock_bh(&vi->rx_mode_lock); + vi->rx_mode_work_enabled = false; + spin_unlock_bh(&vi->rx_mode_lock); + + flush_work(&vi->rx_mode_work); +} + static void virtqueue_napi_schedule(struct napi_struct *napi, struct virtqueue *vq) { @@ -1974,6 +1999,8 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, /* Caller should know better */ BUG_ON(!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)); + ASSERT_RTNL(); + vi->ctrl->status = ~0; vi->ctrl->hdr.class = class; vi->ctrl->hdr.cmd = cmd; @@ -2160,9 +2187,11 @@ static int virtnet_close(struct net_device *dev) return 0; } -static void virtnet_set_rx_mode(struct net_device *dev) +static void virtnet_rx_mode_work(struct work_struct *work) { - struct virtnet_info *vi = netdev_priv(dev); + struct virtnet_info *vi = + container_of(work, struct virtnet_info, rx_mode_work); + struct net_device *dev = vi->dev; struct scatterlist sg[2]; struct virtio_net_ctrl_mac *mac_data; struct netdev_hw_addr *ha; @@ -2175,8 +2204,12 @@ static void virtnet_set_rx_mode(struct net_device *dev) if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_RX)) return; + rtnl_lock(); + + netif_addr_lock_bh(dev); vi->ctrl->promisc = ((dev->flags & IFF_PROMISC) != 0); vi->ctrl->allmulti = ((dev->flags & IFF_ALLMULTI) != 0); + netif_addr_unlock_bh(dev); sg_init_one(sg, &vi->ctrl->promisc, sizeof(vi->ctrl->promisc)); @@ -2192,14 +2225,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"); + netif_addr_lock_bh(dev); + uc_count = netdev_uc_count(dev); mc_count = netdev_mc_count(dev); /* MAC filter - use one buffer for both lists */ buf = kzalloc(((uc_count + mc_count) * ETH_ALEN) + (2 * sizeof(mac_data->entries)), GFP_ATOMIC); mac_data = buf; - if (!buf) + if (!buf) { + netif_addr_unlock_bh(dev); + rtnl_unlock(); return; + } sg_init_table(sg, 2); @@ -2220,6 +2258,8 @@ static void virtnet_set_rx_mode(struct net_device *dev) netdev_for_each_mc_addr(ha, dev) memcpy(&mac_data->macs[i++][0], ha->addr, ETH_ALEN); + netif_addr_unlock_bh(dev); + sg_set_buf(&sg[1], mac_data, sizeof(mac_data->entries) + (mc_count * ETH_ALEN)); @@ -2227,9 +2267,21 @@ static void virtnet_set_rx_mode(struct net_device *dev) VIRTIO_NET_CTRL_MAC_TABLE_SET, sg)) dev_warn(&dev->dev, "Failed to set MAC filter table.\n"); + rtnl_unlock(); + kfree(buf); } +static void virtnet_set_rx_mode(struct net_device *dev) +{ + struct virtnet_info *vi = netdev_priv(dev); + + spin_lock(&vi->rx_mode_lock); + if (vi->rx_mode_work_enabled) + schedule_work(&vi->rx_mode_work); + spin_unlock(&vi->rx_mode_lock); +} + static int virtnet_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid) { @@ -3000,6 +3052,7 @@ static void virtnet_freeze_down(struct virtio_device *vdev) /* Make sure no work handler is accessing the device */ flush_work(&vi->config_work); + disable_rx_mode_work(vi); netif_tx_lock_bh(vi->dev); netif_device_detach(vi->dev); @@ -3022,6 +3075,8 @@ static int virtnet_restore_up(struct virtio_device *vdev) virtio_device_ready(vdev); enable_delayed_refill(vi); + enable_rx_mode_work(vi); + virtnet_set_rx_mode(vi->dev); if (netif_running(vi->dev)) { err = virtnet_open(vi->dev); @@ -3799,7 +3854,9 @@ static int virtnet_probe(struct virtio_device *vdev) vdev->priv = vi; 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); + spin_lock_init(&vi->rx_mode_lock); if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) vi->mergeable_rx_bufs = true; @@ -3905,6 +3962,8 @@ static int virtnet_probe(struct virtio_device *vdev) if (vi->has_rss || vi->has_rss_hash_report) virtnet_init_default_rss(vi); + enable_rx_mode_work(vi); + /* serialize netdev register + virtio_device_ready() with ndo_open() */ rtnl_lock(); @@ -3984,6 +4043,7 @@ static void virtnet_remove(struct virtio_device *vdev) /* Make sure no work handler is accessing the device. */ flush_work(&vi->config_work); + disable_rx_mode_work(vi); unregister_netdev(vi->dev); From patchwork Mon Dec 26 07:49:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 36554 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp795130wrt; Sun, 25 Dec 2022 23:52:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXsZP02Uqch1NRkpKC0EB5STXg3yDzkSJtHYRmam8zmG21nn6U3hCKE9z0pLXRumMspKhSNm X-Received: by 2002:a05:6402:33a:b0:469:ae36:b954 with SMTP id q26-20020a056402033a00b00469ae36b954mr18520651edw.30.1672041142023; Sun, 25 Dec 2022 23:52:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672041142; cv=none; d=google.com; s=arc-20160816; b=h6zc3e1oF7uPU1xzXWRt7Y1//RZYDqMPFKnpIvz+nfuEXigAA479pjmemX1o/Q7Eir s/E8uKVvPJRocmF6XPvIN7yNLJMw2AND6fXL2QY9V62K5OO5A+gZBRqb5DRZR9FCYp/S 0ZlsyzrbmylBD9Id+OvPwaedNreKBM488OeUdP5oM//JM+0hC460VOItBcq+v+zye9dW qvRvCpbQ6ht8CNw+mCBAZAiZFrGWhDnn2VyqJwzbh0W1zEFOMzzG5pVAnefsBa7Xlrl5 P7e1WcJuTJcmSmu8XGpOVOs7kul8cCc0iz7L798bxsPqjLBrOEfi7vK+48Sh6wNndh99 zfTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=35zLZwgpZzPWsmc0E40bJzgqya6RhlIevYxkApG1GCU=; b=0vhP/CX0w80iANLlZOn8CYJbpWxUMoocNmqHREjglEeVyYaBY08d7uR1O3hwXQVtTx m7uKLKI9kKnFsNKfvVUr+UH5YrxfehN6XE7Yd/zsj5VN+t5/L2ZtXdVzBzjM4iRN9Bjg R84MgqN/VJGfNQBF1v2KPRSXaSqSdsiMPVI9GjPC+ubHp22pVIq1lHeX9+DooVKf5OV6 ktUFrX6k1Bd5/P/pF1KC9hRHz3E0SwHJyKt52Jxl4MVknNZ7cgasSGm2zgvWpgL8CtW8 V8ISUYBmCxql2sHMgQQiIcVuXxeytUzDmk7kBg/MVrVZ78+iTmcFMgeyFl5mL4RUCWWR liZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gSJXZ4jP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o15-20020a056402038f00b00481f6b77528si6390176edv.392.2022.12.25.23.51.58; Sun, 25 Dec 2022 23:52:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gSJXZ4jP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231824AbiLZHu0 (ORCPT + 99 others); Mon, 26 Dec 2022 02:50:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231777AbiLZHuM (ORCPT ); Mon, 26 Dec 2022 02:50:12 -0500 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 AAEFE55B0 for ; Sun, 25 Dec 2022 23:49:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672040969; 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=35zLZwgpZzPWsmc0E40bJzgqya6RhlIevYxkApG1GCU=; b=gSJXZ4jPVbWOTXYbqdiHDvSxJvfCFEf8dEHn7fPHAFAZAJnlwqFq92Nv6Pf5okKvJP7p4y iDYiciyODeHpsiPSQ3S1mMenYdK7RUmdNTry3+6Hi/VqdsbGXlWWxCKkaBmvTcUHbaVGTi HX509qZXx37h6ZdzlXZa0ONjfRAnlnU= 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-167-Sn-ZY8cfO-CI_5uqf-CTGg-1; Mon, 26 Dec 2022 02:49:26 -0500 X-MC-Unique: Sn-ZY8cfO-CI_5uqf-CTGg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C5DCC380406F; Mon, 26 Dec 2022 07:49:25 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-100.pek2.redhat.com [10.72.13.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E0B9492B00; Mon, 26 Dec 2022 07:49:20 +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, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, maxime.coquelin@redhat.com, alvaro.karsz@solid-run.com, eperezma@redhat.com Subject: [PATCH 2/4] virtio_ring: switch to use BAD_RING() Date: Mon, 26 Dec 2022 15:49:06 +0800 Message-Id: <20221226074908.8154-3-jasowang@redhat.com> In-Reply-To: <20221226074908.8154-1-jasowang@redhat.com> References: <20221226074908.8154-1-jasowang@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753262212549640542?= X-GMAIL-MSGID: =?utf-8?q?1753262212549640542?= Switch to reuse BAD_RING() to allow common logic to be implemented in BAD_RING(). Signed-off-by: Jason Wang --- Changes since V1: - switch to use BAD_RING in virtio_break_device() --- drivers/virtio/virtio_ring.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 2e7689bb933b..5cfb2fa8abee 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -58,7 +58,8 @@ do { \ dev_err(&_vq->vq.vdev->dev, \ "%s:"fmt, (_vq)->vq.name, ##args); \ - (_vq)->broken = true; \ + /* Pairs with READ_ONCE() in virtqueue_is_broken(). */ \ + WRITE_ONCE((_vq)->broken, true); \ } while (0) #define START_USE(vq) #define END_USE(vq) @@ -2237,7 +2238,7 @@ bool virtqueue_notify(struct virtqueue *_vq) /* Prod other side to tell it about changes. */ if (!vq->notify(_vq)) { - vq->broken = true; + BAD_RING(vq, "vq %d is broken\n", vq->vq.index); return false; } return true; @@ -2786,8 +2787,7 @@ void virtio_break_device(struct virtio_device *dev) list_for_each_entry(_vq, &dev->vqs, list) { struct vring_virtqueue *vq = to_vvq(_vq); - /* Pairs with READ_ONCE() in virtqueue_is_broken(). */ - WRITE_ONCE(vq->broken, true); + BAD_RING(vq, "Device break vq %d", _vq->index); } spin_unlock(&dev->vqs_list_lock); } From patchwork Mon Dec 26 07:49:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 36556 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp795312wrt; Sun, 25 Dec 2022 23:53:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXvplU9/e4B638qgVfBra16GrMnnV4Das2/PzRIqrPcWlz52I8NZ2Ntmg8yw5YDl2lQ9Efot X-Received: by 2002:a17:907:7094:b0:844:1d1d:1fa with SMTP id yj20-20020a170907709400b008441d1d01famr14193937ejb.23.1672041182025; Sun, 25 Dec 2022 23:53:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672041182; cv=none; d=google.com; s=arc-20160816; b=QUCSiE8rHjQfym2wBncgVgGX5Io+9FQnu7fRQCXCldP3gFiDsdRlnq7puE5TEUL2El Hr541AQw2xaKPcRA2iJ+2Fy6uFYwXktrOzJU1SOfY6m9J3+98cO1NwR0r7Y9S5CuampN orjVBuU6VUi2Qd+PHSFxSSQsRdU4Uw1+Y2UufZDTai2HQqHnvybmOFnY0VICk632eBof DHtOpaM78a6FyeyYqpE/8xtefKZPerusSqpIhlhQJIHNUoTdZPSxyGsD7TES5fVeZN3Q zUvYSI9IEOF3eXrLns94LoFR0+eHJpXquVT1pdOG3qRdrr362+7ETYAlHtbJ6Ff7NW8X EV8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=H/Y/p/qkj6rtja+GTIriOAzlecVLNXF/oN1BvsWBKKY=; b=Lp8jylE5bt82f3YzsgnFoIf7uidGeoJX3yiYbkBAN/ZGdYfvAedrG2ewJSi4THrfiU siN5buSDGCigv5qlukBWGdRQuc5ba3uXO6l5jh1fwXctuihL/wJGQfb/z77KozuHxdUV qX+Jhy0egARAbXkgvv2J82y0u+tEWMoAZwP4MD8QbtMt9GwF/YjlcuH1PHHxayyNkXyB curmyvOvEBlKcyP6MDGEpwZzZle+HXxvesRD2ztpXcWEzgGw7HSI1Qpmg6uvOkLcMfMc c6vr5gt066BZ72NByK6EpRY+hS5SDQww5ZVYND1ZkoG19DpyqjcGorhF3ShRDtojZnPD 8pCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=g07FrQHu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id be5-20020a1709070a4500b007c1727f7c6fsi7825866ejc.261.2022.12.25.23.52.38; Sun, 25 Dec 2022 23:53:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=g07FrQHu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231899AbiLZHuu (ORCPT + 99 others); Mon, 26 Dec 2022 02:50:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231814AbiLZHuX (ORCPT ); Mon, 26 Dec 2022 02:50:23 -0500 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 93FAF5FE3 for ; Sun, 25 Dec 2022 23:49:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672040974; 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=H/Y/p/qkj6rtja+GTIriOAzlecVLNXF/oN1BvsWBKKY=; b=g07FrQHuFKizmKBDHbtKSII5lRBSZWY/oaSQTCPKwDZaKYy3sOftsoG27E+EH1paIp/Be6 2MD8T1Pv5Lir6o8aqUxrueo2rKjGKCxY532Wj09JyV3XHb7jNODO1DMopPcK5+6uVEWgC3 ZvPUQ5j9o/cvQEdQmCQ1zhJyv9eorDE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-112-Cl6FKtC-O92R4jqHTvdGlQ-1; Mon, 26 Dec 2022 02:49:31 -0500 X-MC-Unique: Cl6FKtC-O92R4jqHTvdGlQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1DD1A101A521; Mon, 26 Dec 2022 07:49:31 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-100.pek2.redhat.com [10.72.13.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7642D492B00; Mon, 26 Dec 2022 07:49:26 +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, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, maxime.coquelin@redhat.com, alvaro.karsz@solid-run.com, eperezma@redhat.com Subject: [PATCH 3/4] virtio_ring: introduce a per virtqueue waitqueue Date: Mon, 26 Dec 2022 15:49:07 +0800 Message-Id: <20221226074908.8154-4-jasowang@redhat.com> In-Reply-To: <20221226074908.8154-1-jasowang@redhat.com> References: <20221226074908.8154-1-jasowang@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753262254622841933?= X-GMAIL-MSGID: =?utf-8?q?1753262254622841933?= This patch introduces a per virtqueue waitqueue to allow driver to sleep and wait for more used. Two new helpers are introduced to allow driver to sleep and wake up. Signed-off-by: Jason Wang --- Changes since V1: - check virtqueue_is_broken() as well - use more_used() instead of virtqueue_get_buf() to allow caller to get buffers afterwards --- drivers/virtio/virtio_ring.c | 29 +++++++++++++++++++++++++++++ include/linux/virtio.h | 3 +++ 2 files changed, 32 insertions(+) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 5cfb2fa8abee..9c83eb945493 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #ifdef DEBUG @@ -60,6 +61,7 @@ "%s:"fmt, (_vq)->vq.name, ##args); \ /* Pairs with READ_ONCE() in virtqueue_is_broken(). */ \ WRITE_ONCE((_vq)->broken, true); \ + wake_up_interruptible(&(_vq)->wq); \ } while (0) #define START_USE(vq) #define END_USE(vq) @@ -203,6 +205,9 @@ struct vring_virtqueue { /* DMA, allocation, and size information */ bool we_own_ring; + /* Wait for buffer to be used */ + wait_queue_head_t wq; + #ifdef DEBUG /* They're supposed to lock for us. */ unsigned int in_use; @@ -2024,6 +2029,8 @@ static struct virtqueue *vring_create_virtqueue_packed( if (virtio_has_feature(vdev, VIRTIO_F_ORDER_PLATFORM)) vq->weak_barriers = false; + init_waitqueue_head(&vq->wq); + err = vring_alloc_state_extra_packed(&vring_packed); if (err) goto err_state_extra; @@ -2517,6 +2524,8 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index, if (virtio_has_feature(vdev, VIRTIO_F_ORDER_PLATFORM)) vq->weak_barriers = false; + init_waitqueue_head(&vq->wq); + err = vring_alloc_state_extra_split(vring_split); if (err) { kfree(vq); @@ -2654,6 +2663,8 @@ static void vring_free(struct virtqueue *_vq) { struct vring_virtqueue *vq = to_vvq(_vq); + wake_up_interruptible(&vq->wq); + if (vq->we_own_ring) { if (vq->packed_ring) { vring_free_queue(vq->vq.vdev, @@ -2863,4 +2874,22 @@ const struct vring *virtqueue_get_vring(struct virtqueue *vq) } EXPORT_SYMBOL_GPL(virtqueue_get_vring); +int virtqueue_wait_for_used(struct virtqueue *_vq) +{ + struct vring_virtqueue *vq = to_vvq(_vq); + + /* TODO: Tweak the timeout. */ + return wait_event_interruptible_timeout(vq->wq, + virtqueue_is_broken(_vq) || more_used(vq), HZ); +} +EXPORT_SYMBOL_GPL(virtqueue_wait_for_used); + +void virtqueue_wake_up(struct virtqueue *_vq) +{ + struct vring_virtqueue *vq = to_vvq(_vq); + + wake_up_interruptible(&vq->wq); +} +EXPORT_SYMBOL_GPL(virtqueue_wake_up); + MODULE_LICENSE("GPL"); diff --git a/include/linux/virtio.h b/include/linux/virtio.h index dcab9c7e8784..2eb62c774895 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -72,6 +72,9 @@ void *virtqueue_get_buf(struct virtqueue *vq, unsigned int *len); void *virtqueue_get_buf_ctx(struct virtqueue *vq, unsigned int *len, void **ctx); +int virtqueue_wait_for_used(struct virtqueue *vq); +void virtqueue_wake_up(struct virtqueue *vq); + void virtqueue_disable_cb(struct virtqueue *vq); bool virtqueue_enable_cb(struct virtqueue *vq); From patchwork Mon Dec 26 07:49:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 36557 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp795738wrt; Sun, 25 Dec 2022 23:55:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXuiAtXce1pqHXq3Cg47VR5pqjeW1FnWfSQIRjDEFVqITYFaeRAGHYBujpJFzMmX1Cg+Gk9c X-Received: by 2002:a05:6402:ea0:b0:46f:68d0:76 with SMTP id h32-20020a0564020ea000b0046f68d00076mr12107810eda.34.1672041301675; Sun, 25 Dec 2022 23:55:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672041301; cv=none; d=google.com; s=arc-20160816; b=nvS18MZ6kHo+h6IIrE5GeFdtSZEcN7wJNsG58r7bXFkiztZKXgqr5x2fpgCxbV3krD xSZ13SHnAxfu+9JlUkd5U0/9h2zrLePRwLTGrmU2hNKQ5c8q67fCvhZYxr5/+JFE/BnM chUjc4d14JSsQlZ7E3mApWt5cN1uNhJTRpmV1gP1sVo5QmW9UBMHUuNVP0Z//ayweFhp pFWSr7apbn8qA8IO0scl/b/Bn5GFIKmgjisorhu2Zbwq5Yz6qSz/DiLiuvJS22rzDHuY 9trwUgql2Vd+HUPW3v0WqlfKfCR04FajvzrtKBkbKyBwYgmhq7hBFvoF1WVPDxlpyowv FP3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cQQAF2roIs1AkbrATZH+Dx5zgxJxII5XuDrBnrFmmR0=; b=V+IMXyQ3pC+RR4WgAwkpTq6FyJB1yNB38tzY7547alW3GrFyvbwTbvLO9Kh5GFlzck nFNklzw5Ejh9kARj6Vcs+cwJ2A8jeJAu6P+ToWgJWH+535LFAdVA0rPJ0gDQsUpLe49L GFLZOj85X+c8A8i2JwlbKtMF7pAaQ5Nfm+CpWuMDgi1mv8Q7vOn5A6TI3ngJO7jWc6V8 ESW+7eReUotlH2ugshDkWdEwsu++JASKuyRrJMHa9PfC3o5MUeC4QvuuzJZ436rQHyoO 9VZRikHe6QMgrDxCgivGqnHruhEaZay460QdwiyIyCX/GtG5GKVbezaHVxV4TPxXf1oe 6hSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fvQ9pBgh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m4-20020aa7c2c4000000b0045c97cb9027si8027193edp.421.2022.12.25.23.54.38; Sun, 25 Dec 2022 23:55:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fvQ9pBgh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231904AbiLZHuw (ORCPT + 99 others); Mon, 26 Dec 2022 02:50:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231819AbiLZHuY (ORCPT ); Mon, 26 Dec 2022 02:50:24 -0500 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 1D0C7615F for ; Sun, 25 Dec 2022 23:49:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672040980; 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=cQQAF2roIs1AkbrATZH+Dx5zgxJxII5XuDrBnrFmmR0=; b=fvQ9pBghg2PDnyPDrafgNgpe4X28DvyXSyDUJJ/QJL+B+X0xXbl8rRCky7fV+EWAi7Ix2h XykaH+cPqPYEUJ4uOO6sL1gkAR2QkwQHmYxhxeWbpOWMjU+SfU8QBw+DM0EbYbeK/y2PsK +ViIZOYEq/OVRnsh7bK/InxEnWrdt8E= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-198-fpqLXZzLMJGNQN3y84BlPg-1; Mon, 26 Dec 2022 02:49:37 -0500 X-MC-Unique: fpqLXZzLMJGNQN3y84BlPg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A4982101A52E; Mon, 26 Dec 2022 07:49:36 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-100.pek2.redhat.com [10.72.13.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE333492B00; Mon, 26 Dec 2022 07:49:31 +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, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, maxime.coquelin@redhat.com, alvaro.karsz@solid-run.com, eperezma@redhat.com Subject: [PATCH 4/4] virtio-net: sleep instead of busy waiting for cvq command Date: Mon, 26 Dec 2022 15:49:08 +0800 Message-Id: <20221226074908.8154-5-jasowang@redhat.com> In-Reply-To: <20221226074908.8154-1-jasowang@redhat.com> References: <20221226074908.8154-1-jasowang@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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_NONE, RCVD_IN_MSPIKE_H2,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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753262380051363642?= X-GMAIL-MSGID: =?utf-8?q?1753262380051363642?= We used to busy waiting on the cvq command this tends to be problematic since: 1) CPU could wait for ever on a buggy/malicous device 2) There's no wait to terminate the process that triggers the cvq command So this patch switch to use virtqueue_wait_for_used() to sleep with a timeout (1s) instead of busy polling for the cvq command forever. This gives the scheduler a breath and can let the process can respond to asignal. If the device doesn't respond in the timeout, break the device. Signed-off-by: Jason Wang --- Changes since V1: - break the device when timeout - get buffer manually since the virtio core check more_used() instead --- drivers/net/virtio_net.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index efd9dd55828b..6a2ea64cfcb5 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -405,6 +405,7 @@ static void disable_rx_mode_work(struct virtnet_info *vi) vi->rx_mode_work_enabled = false; spin_unlock_bh(&vi->rx_mode_lock); + virtqueue_wake_up(vi->cvq); flush_work(&vi->rx_mode_work); } @@ -1497,6 +1498,11 @@ static bool try_fill_recv(struct virtnet_info *vi, struct receive_queue *rq, return !oom; } +static void virtnet_cvq_done(struct virtqueue *cvq) +{ + virtqueue_wake_up(cvq); +} + static void skb_recv_done(struct virtqueue *rvq) { struct virtnet_info *vi = rvq->vdev->priv; @@ -1984,6 +1990,8 @@ static int virtnet_tx_resize(struct virtnet_info *vi, return err; } +static int virtnet_close(struct net_device *dev); + /* * Send command via the control virtqueue and check status. Commands * supported by the hypervisor, as indicated by feature bits, should @@ -2026,14 +2034,14 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, if (unlikely(!virtqueue_kick(vi->cvq))) return vi->ctrl->status == VIRTIO_NET_OK; - /* 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(); + if (virtqueue_wait_for_used(vi->cvq)) { + virtqueue_get_buf(vi->cvq, &tmp); + return vi->ctrl->status == VIRTIO_NET_OK; + } - return vi->ctrl->status == VIRTIO_NET_OK; + netdev_err(vi->dev, "CVQ command timeout, break the virtio device."); + virtio_break_device(vi->vdev); + return VIRTIO_NET_ERR; } static int virtnet_set_mac_address(struct net_device *dev, void *p) @@ -3526,7 +3534,7 @@ static int virtnet_find_vqs(struct virtnet_info *vi) /* Parameters for control virtqueue, if any */ if (vi->has_cvq) { - callbacks[total_vqs - 1] = NULL; + callbacks[total_vqs - 1] = virtnet_cvq_done; names[total_vqs - 1] = "control"; }