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 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C82FCC3F68F for ; Sun, 22 Dec 2019 21:12:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9CDC5206CB for ; Sun, 22 Dec 2019 21:12:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZlrEysvf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726215AbfLVVMg (ORCPT ); Sun, 22 Dec 2019 16:12:36 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57929 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726010AbfLVVMf (ORCPT ); Sun, 22 Dec 2019 16:12:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577049153; 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=81SBuCurUKDda2T3riG+gGj1L6z+mCbC0XqMo/gy184=; b=ZlrEysvfByd1JdyWZGjg2CKrLu+jCr8XUHegAXrDGK8xc4oKUO3FcvSiB5ernA6v8ZZ0yw pFO8e7EmmOkAEuJPuVesPa2qTtG6Qq0+1dPH0hM4T0NH7yZUsX3npwnUf1tPZYFLiQTq4s BtcoWut8VyQZLTRmEC9EnD1MNjKmHlk= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-nfNGtFnhNQy7kIHM351gIA-1; Sun, 22 Dec 2019 16:12:32 -0500 X-MC-Unique: nfNGtFnhNQy7kIHM351gIA-1 Received: by mail-qk1-f200.google.com with SMTP id j16so5555731qkk.17 for ; Sun, 22 Dec 2019 13:12:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=81SBuCurUKDda2T3riG+gGj1L6z+mCbC0XqMo/gy184=; b=ZeUhTyAx7nI8LXd2wBTvFxtuqv8D93yR9L29QhjlciX0/9u6NrnYPkfG55FEiTzkqs pwGO3N4ypDiK8dFG5OHiUWwjv8cGWR16fDs6t7AVYL9xBFtzrrwI7MQ4F9VerJn82rfV yAjCWAq2vzquPQvLO6kBBwyvp5L4nTXEm7LZrgbD0k+XK9CE9awKCbmYQfOkX1IAj8SG Eevh88aCW9hmIU8mHDgHAztF5ciNZ88t6zJPkRlpDazpYukWfOEKg2mysW5RXmfkcjV1 ezJaD/UIvW9idq0KN6DxRtjIQY8+rgk4awhsFkjHbJR3pq2XRm1k3d65HLgL7/JHGV0q EH1g== X-Gm-Message-State: APjAAAVbQ0Rncyh7fUrQaIfb82V3RjQI6bPMqnPJ8BxvtuFhb66IFpw4 JldO2cqlA0bsNygZOjlv8U+Gi+148jICboCXbGHB++/SUTO7G5GxWt5TJ17METQbjEqPI6J62ti bULJ9cr2Irt3ak1MB X-Received: by 2002:a37:9f94:: with SMTP id i142mr23653860qke.244.1577049150849; Sun, 22 Dec 2019 13:12:30 -0800 (PST) X-Google-Smtp-Source: APXvYqyee3TDUK2xiV+RGjhrO597mucerzvzO/mbJz+IvyD1eg//weY86y+Ev3OUQISI61t6u1ufJg== X-Received: by 2002:a37:9f94:: with SMTP id i142mr23653830qke.244.1577049150486; Sun, 22 Dec 2019 13:12:30 -0800 (PST) Received: from redhat.com (bzq-79-181-48-215.red.bezeqint.net. [79.181.48.215]) by smtp.gmail.com with ESMTPSA id k73sm5182459qke.36.2019.12.22.13.12.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Dec 2019 13:12:29 -0800 (PST) Date: Sun, 22 Dec 2019 16:12:24 -0500 From: "Michael S. Tsirkin" To: Willem de Bruijn Cc: Alistair Delva , Network Development , stable , Jason Wang , "David S . Miller" , kernel-team@android.com, virtualization@lists.linux-foundation.org, linux-kernel Subject: Re: [PATCH net] virtio-net: Skip set_features on non-cvq devices Message-ID: <20191222160850-mutt-send-email-mst@kernel.org> References: <20191220212207.76726-1-adelva@google.com> <20191222080754-mutt-send-email-mst@kernel.org> <20191222095141-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Sun, Dec 22, 2019 at 10:54:23AM -0500, Willem de Bruijn wrote: > On Sun, Dec 22, 2019 at 9:57 AM Michael S. Tsirkin wrote: > > > > On Sun, Dec 22, 2019 at 09:21:43AM -0500, Willem de Bruijn wrote: > > > On Sun, Dec 22, 2019 at 8:11 AM Michael S. Tsirkin wrote: > > > > > > > > On Fri, Dec 20, 2019 at 10:08:41PM -0500, Willem de Bruijn wrote: > > > > > On Fri, Dec 20, 2019 at 4:22 PM Alistair Delva wrote: > > > > > > > > > > > > On devices without control virtqueue support, such as the virtio_net > > > > > > implementation in crosvm[1], attempting to configure LRO will panic the > > > > > > kernel: > > > > > > > > > > > > kernel BUG at drivers/net/virtio_net.c:1591! > > > > > > invalid opcode: 0000 [#1] PREEMPT SMP PTI > > > > > > CPU: 1 PID: 483 Comm: Binder:330_1 Not tainted 5.4.5-01326-g19463e9acaac #1 > > > > > > Hardware name: ChromiumOS crosvm, BIOS 0 > > > > > > RIP: 0010:virtnet_send_command+0x15d/0x170 [virtio_net] > > > > > > Code: d8 00 00 00 80 78 02 00 0f 94 c0 65 48 8b 0c 25 28 00 00 00 48 3b 4c 24 70 75 11 48 8d 65 d8 5b 41 5c 41 5d 41 5e 41 5f 5d c3 <0f> 0b e8 ec a4 12 c8 66 90 66 2e 0f 1f 84 00 00 00 00 00 55 48 89 > > > > > > RSP: 0018:ffffb97940e7bb50 EFLAGS: 00010246 > > > > > > RAX: ffffffffc0596020 RBX: ffffa0e1fc8ea840 RCX: 0000000000000017 > > > > > > RDX: ffffffffc0596110 RSI: 0000000000000011 RDI: 000000000000000d > > > > > > RBP: ffffb97940e7bbf8 R08: ffffa0e1fc8ea0b0 R09: ffffa0e1fc8ea0b0 > > > > > > R10: ffffffffffffffff R11: ffffffffc0590940 R12: 0000000000000005 > > > > > > R13: ffffa0e1ffad2c00 R14: ffffb97940e7bc08 R15: 0000000000000000 > > > > > > FS: 0000000000000000(0000) GS:ffffa0e1fd100000(006b) knlGS:00000000e5ef7494 > > > > > > CS: 0010 DS: 002b ES: 002b CR0: 0000000080050033 > > > > > > CR2: 00000000e5eeb82c CR3: 0000000079b06001 CR4: 0000000000360ee0 > > > > > > DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > > > > > > DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 > > > > > > Call Trace: > > > > > > ? preempt_count_add+0x58/0xb0 > > > > > > ? _raw_spin_lock_irqsave+0x36/0x70 > > > > > > ? _raw_spin_unlock_irqrestore+0x1a/0x40 > > > > > > ? __wake_up+0x70/0x190 > > > > > > virtnet_set_features+0x90/0xf0 [virtio_net] > > > > > > __netdev_update_features+0x271/0x980 > > > > > > ? nlmsg_notify+0x5b/0xa0 > > > > > > dev_disable_lro+0x2b/0x190 > > > > > > ? inet_netconf_notify_devconf+0xe2/0x120 > > > > > > devinet_sysctl_forward+0x176/0x1e0 > > > > > > proc_sys_call_handler+0x1f0/0x250 > > > > > > proc_sys_write+0xf/0x20 > > > > > > __vfs_write+0x3e/0x190 > > > > > > ? __sb_start_write+0x6d/0xd0 > > > > > > vfs_write+0xd3/0x190 > > > > > > ksys_write+0x68/0xd0 > > > > > > __ia32_sys_write+0x14/0x20 > > > > > > do_fast_syscall_32+0x86/0xe0 > > > > > > entry_SYSENTER_compat+0x7c/0x8e > > > > > > > > > > > > This happens because virtio_set_features() does not check the presence > > > > > > of the control virtqueue feature, which is sanity checked by a BUG_ON > > > > > > in virtnet_send_command(). > > > > > > > > > > > > Fix this by skipping any feature processing if the control virtqueue is > > > > > > missing. This should be OK for any future feature that is added, as > > > > > > presumably all of them would require control virtqueue support to notify > > > > > > the endpoint that offload etc. should begin. > > > > > > > > > > > > [1] https://chromium.googlesource.com/chromiumos/platform/crosvm/ > > > > > > > > > > > > Fixes: a02e8964eaf9 ("virtio-net: ethtool configurable LRO") > > > > > > Cc: stable@vger.kernel.org [4.20+] > > > > > > Cc: Michael S. Tsirkin > > > > > > Cc: Jason Wang > > > > > > Cc: David S. Miller > > > > > > Cc: kernel-team@android.com > > > > > > Cc: virtualization@lists.linux-foundation.org > > > > > > Cc: linux-kernel@vger.kernel.org > > > > > > Signed-off-by: Alistair Delva > > > > > > > > > > Thanks for debugging this, Alistair. > > > > > > > > > > > --- > > > > > > drivers/net/virtio_net.c | 3 +++ > > > > > > 1 file changed, 3 insertions(+) > > > > > > > > > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > > > > > index 4d7d5434cc5d..709bcd34e485 100644 > > > > > > --- a/drivers/net/virtio_net.c > > > > > > +++ b/drivers/net/virtio_net.c > > > > > > @@ -2560,6 +2560,9 @@ static int virtnet_set_features(struct net_device *dev, > > > > > > u64 offloads; > > > > > > int err; > > > > > > > > > > > > + if (!vi->has_cvq) > > > > > > + return 0; > > > > > > + > > > > > > > > > > Instead of checking for this in virtnet_set_features, how about we > > > > > make configurability contingent on cvq in virtnet_probe: > > > > > > > > > > - if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS)) > > > > > + if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS) && > > > > > + virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ)) > > > > > dev->hw_features |= NETIF_F_LRO; > > > > > > > > > > Based on this logic a little below in the same function > > > > > > > > > > if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ)) > > > > > vi->has_cvq = true; > > > > > > > > > > > > This would be a regression on old hypervisors which didn't have > > > > CTL VQ - suddenly they will lose offloads. > > > > > > dev->features still correctly displays whether offloads are enabled. > > > Removing it from dev->hw_features just renders it non-configurable. > > > > Oh you are right. I confused it with dev->features. > > > > > Note that before the patch that is being fixed the offloads were > > > enabled, but ethtool would show them as off. > > > > So the bug is in spec, it should have said > > VIRTIO_NET_F_CTRL_GUEST_OFFLOADS depends on VIRTIO_NET_F_CTRL_VQ, but we > > missed that part. We can and I guess should add this as a recommendation > > but it's too late to make it a MUST. > > > > Meanwhile I would say it's cleanest to work around > > this in virtnet_validate by clearing VIRTIO_NET_F_CTRL_GUEST_OFFLOADS > > if VIRTIO_NET_F_CTRL_VQ is off, with a big comment explaining > > it's a spec bug. > > Wouldn't that cause precisely the regression you were concerned about? Not sure how do you mean. VIRTIO_NET_F_CTRL_GUEST_OFFLOADS simply can't work without a ctrl vq. What's the point of keeping it on? > Workloads may now depend on LRO for cycle efficiency. Reverting to > behavior before this patch (though now displaying the offload state > correctly) is more conservative in that regard. Do you see a problem with the following (untested): Signed-off-by: Michael S. Tsirkin diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 4d7d5434cc5d..7b8805b47f0d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2971,6 +2971,15 @@ static int virtnet_validate(struct virtio_device *vdev) if (!virtnet_validate_features(vdev)) return -EINVAL; + /* VIRTIO_NET_F_CTRL_GUEST_OFFLOADS does not work without + * VIRTIO_NET_F_CTRL_VQ. Unfortunately spec forgot to + * specify that VIRTIO_NET_F_CTRL_GUEST_OFFLOADS depends + * on VIRTIO_NET_F_CTRL_VQ so devices can set the later but + * not the former. + */ + if (!virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ)) + __virtio_clear_bit(vdev, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS); + if (virtio_has_feature(vdev, VIRTIO_NET_F_MTU)) { int mtu = virtio_cread16(vdev, offsetof(struct virtio_net_config,