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=unavailable 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 087A8C3F68F for ; Sun, 22 Dec 2019 13:11:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D15F72070A for ; Sun, 22 Dec 2019 13:11:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eFW56aRl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726267AbfLVNLa (ORCPT ); Sun, 22 Dec 2019 08:11:30 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:28661 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725997AbfLVNL3 (ORCPT ); Sun, 22 Dec 2019 08:11:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577020287; 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=7gCpuLlUP9MlgLBoutsCmLPmUqjnC7xAMqI1v5Bo+1w=; b=eFW56aRlDtYw8KN20qT/5ZtAuzrxmc9MI9Sw8fXFJYBUo9Qxbdsrqxj17wuIS6bUFz/I3Q Sbm0korOniwfHQihm7DDVJyMkCgVDLhrjR77+oBP05wY6IW1naTEldGp6XMMzTDCc9MZr4 +HHJ/8VYIr8ozDnzf9RoDv1Ba9yOcoA= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-81-TL_JmEATM3mO2j-WwrgowQ-1; Sun, 22 Dec 2019 08:11:24 -0500 X-MC-Unique: TL_JmEATM3mO2j-WwrgowQ-1 Received: by mail-qv1-f70.google.com with SMTP id ce17so9578281qvb.5 for ; Sun, 22 Dec 2019 05:11:24 -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=7gCpuLlUP9MlgLBoutsCmLPmUqjnC7xAMqI1v5Bo+1w=; b=tNiSzMbS9PptP1oqOa1ZpuVnIBw44xQBihN1+hGdJoZbTzBaookSoV21G6gnR4DOtq JMAzmyigefnOjjkkFSNWePX+b/2yJm9ylOZE/hA4Eq3rt7Kl/A6GIycq6Q0LH6bL0fiu yEjyVP4kRZLpmbwNRKvRqCagQZFlUQmkLQJ5U+zJ17HXBVLasltojS5VB7pXY1iMJEb9 0TdPEh1deijZohd+J5IHP9O5CBVKZUwaGL1DSIZHpmVKKD1QodyReRz2UTJLdljHaXVZ DZO8KKm5pRFvi12s5yprqJk3JFFU2xYvZ3OfRZvKU8hQ6BWzhY8FJDWze+u2D/rR3GvZ tgwg== X-Gm-Message-State: APjAAAXq2gtbcLMiUOf9aHNl4J0Y52FyYVWPUjo4+oBuDhcMLQlmV05G krP2lTuzLxpLbmhLTbL7dxTUNbFqbqQkGkqdOXaoOKOlHrRqhwEU6kwDRL1Z+LHhEzxo7ME7XL1 mrvXGgSNfdMPYnTbj X-Received: by 2002:a05:6214:10c1:: with SMTP id r1mr20617252qvs.70.1577020282502; Sun, 22 Dec 2019 05:11:22 -0800 (PST) X-Google-Smtp-Source: APXvYqyCAU9CXtW80vVj3OFrSpP2mW5I9KhywcWXV5k/a4ppQvGMJznMPni9g9ftzf6gofObYt4oXA== X-Received: by 2002:a05:6214:10c1:: with SMTP id r1mr20617225qvs.70.1577020282261; Sun, 22 Dec 2019 05:11:22 -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 t38sm5308551qta.78.2019.12.22.05.11.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Dec 2019 05:11:21 -0800 (PST) Date: Sun, 22 Dec 2019 08:11:15 -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: <20191222080754-mutt-send-email-mst@kernel.org> References: <20191220212207.76726-1-adelva@google.com> 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 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. -- MST