Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp4225290rwl; Wed, 28 Dec 2022 00:49:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXvyQ5WJPf3cdCno30rE8SYYi8znHzoKKejtY9rtx/LzYR24NTh25NcHN+z80kVLr8u+6Ex2 X-Received: by 2002:a17:906:7046:b0:7ae:8194:7e06 with SMTP id r6-20020a170906704600b007ae81947e06mr21638563ejj.56.1672217387625; Wed, 28 Dec 2022 00:49:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672217387; cv=none; d=google.com; s=arc-20160816; b=esRIEVyEDP4plWNnsrQXb/2qZOBMqnUZQE/L5fxMePBJxKh8e3mKpAT33SFQHLrEny aBq6YOYAviXBoN71kCjQ/mDH5AMS+v0ZQg4/NlBUAeKJr0AW71vVw41hmg+k450D1PTB YEpnhelhcejto0iVkc2HF1uemn4YDjgVLzu/7Jb3iPDxT/j3lYNC6AyNVYdEHxAGlt+B cO0pt8PW1xHEKAyI5YOhjMk41BwLgjq2BK1BoMEMLo43EX5QOOlhNh87SRxEmeP7CJqI RTSEmKcW9aYmLnDGcuXaZc5+DCeBV/5ImEA+TZ1GyJqnWLQk4LM5QO4g8kFtqcjD2wx8 n2Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:references:cc:to:from:date:subject :message-id; bh=qrbIS+h5zvP0QuiRpE7USxG1Lo7fYfnmlcC5+/IDaAk=; b=xmrjyM2AXuDI/4qqqcxUI/WjyIRIJa/so9yxOMYrG3DFetxhf+LZjbL6bdsbDJVnAj KKOmDiAvSXH53YX+RbzllvcTc/xL/RgxAVGbLO485VgGfJ3HtRRI6TAbBQfXpixo4et4 OXbAuySiUf97HLU27+FSfsa4wKlLZovTRbuanbxGaM/SRh7r0szGpHiZsyDbX88nNjTC iRDSP+WgWUsku/qU1VDS85zmb/ugCe03AdBQwK0sNca+BxX/hcb1sNQuo8OAsQz+ywmW 4o0F4DTmtIAAeEuP4IG9kr2dukomJaHFeeZjC7G9UIKxNipcsUaBULuP540WJqX4BY63 vsAw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cr11-20020a170906d54b00b00787ad97302asi12271144ejc.863.2022.12.28.00.49.32; Wed, 28 Dec 2022 00:49:47 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232606AbiL1Id7 (ORCPT + 65 others); Wed, 28 Dec 2022 03:33:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232225AbiL1Id6 (ORCPT ); Wed, 28 Dec 2022 03:33:58 -0500 Received: from out30-8.freemail.mail.aliyun.com (out30-8.freemail.mail.aliyun.com [115.124.30.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C979EF038; Wed, 28 Dec 2022 00:33:54 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046050;MF=xuanzhuo@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0VYGgWNw_1672216430; Received: from localhost(mailfrom:xuanzhuo@linux.alibaba.com fp:SMTPD_---0VYGgWNw_1672216430) by smtp.aliyun-inc.com; Wed, 28 Dec 2022 16:33:51 +0800 Message-ID: <1672216298.4455094-1-xuanzhuo@linux.alibaba.com> Subject: Re: [PATCH 4/4] virtio-net: sleep instead of busy waiting for cvq command Date: Wed, 28 Dec 2022 16:31:38 +0800 From: Xuan Zhuo To: "Michael S. Tsirkin" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, eperezma@redhat.com, edumazet@google.com, maxime.coquelin@redhat.com, kuba@kernel.org, pabeni@redhat.com, davem@davemloft.net, Jason Wang References: <20221226074908.8154-1-jasowang@redhat.com> <20221226074908.8154-5-jasowang@redhat.com> <1672107557.0142956-1-xuanzhuo@linux.alibaba.com> <20221227014641-mutt-send-email-mst@kernel.org> In-Reply-To: <20221227014641-mutt-send-email-mst@kernel.org> X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL 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 On Tue, 27 Dec 2022 01:58:22 -0500, "Michael S. Tsirkin" wrote: > On Tue, Dec 27, 2022 at 12:33:53PM +0800, Jason Wang wrote: > > On Tue, Dec 27, 2022 at 10:25 AM Xuan Zhuo wrote: > > > > > > On Mon, 26 Dec 2022 15:49:08 +0800, Jason Wang wrote: > > > > 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 > > > > > > I don't think that a fixed 1S is a good choice. > > > > Well, it could be tweaked to be a little bit longer. > > > > One way, as discussed, is to let the device advertise a timeout then > > the driver can validate if it's valid and use that timeout. But it > > needs extension to the spec. > > Controlling timeout from device is a good idea, e.g. hardware devices > would benefit from a shorter timeout, hypervisor devices from a longer > timeout or no timeout. Yes. That is good. Before introducing this feature, I personally like to use "wait", rather than define a timeout. Thanks. > > > > > > Some of the DPUs are very > > > lazy for cvq handle. > > > > Such design needs to be revisited, cvq (control path) should have a > > better priority or QOS than datapath. > > Spec says nothing about this, so driver can't assume this either. > > > > In particular, we will also directly break the device. > > > > It's kind of hardening for malicious devices. > > ATM no amount of hardening can prevent a malicious hypervisor from > blocking the guest. Recovering when a hardware device is broken would be > nice but I think if we do bother then we should try harder to recover, > such as by driving device reset. > > > Also, does your patch break surprise removal? There's no callback > in this case ATM. > > > > > > > I think it is necessary to add a Virtio-Net parameter to allow users to define > > > this timeout by themselves. Although I don't think this is a good way. > > > > Very hard and unfriendly to the end users. > > > > Thanks > > > > > > > > Thanks. > > > > > > > > > > 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"; > > > > } > > > > > > > > -- > > > > 2.25.1 > > > > > > > > _______________________________________________ > > > > Virtualization mailing list > > > > Virtualization@lists.linux-foundation.org > > > > https://lists.linuxfoundation.org/mailman/listinfo/virtualization > > > >