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.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 1706CC2D0C0 for ; Sun, 22 Dec 2019 14:22:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3BE0206CB for ; Sun, 22 Dec 2019 14:22:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="snZO3dXq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726189AbfLVOWZ (ORCPT ); Sun, 22 Dec 2019 09:22:25 -0500 Received: from mail-yw1-f67.google.com ([209.85.161.67]:37217 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725852AbfLVOWY (ORCPT ); Sun, 22 Dec 2019 09:22:24 -0500 Received: by mail-yw1-f67.google.com with SMTP id z7so6161435ywd.4 for ; Sun, 22 Dec 2019 06:22:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=THlA5NTI//lyv3s+FDTGj24TVhpc+hcbOPPNoSPH/Lk=; b=snZO3dXqyqSCfewSRq7k/W6Hof51qOQGHUhEr6BLG1eluc8fcNpJM9hx9e9/dIA4+J 1ir1E4CAapLT7ILyy9d6nzvJ0uXzOp6r3eSK5YmS3z2fkT6bTWDoNy3yFj0G3M8pUa9g EP67rPa+PVNAjksE6j4THtMGTTHecod6rSf58ABnZvzvTklG6lMb8KAUojMKbmKMyKt6 UXHJsily4aV7pneanM3ywb/SaToB8htimqDPpkuDB8HQB5p5wZAyG9+rQ2CMOFjAFlCw xg+FiHLOYmqVNXVO3a6deF9/Tyx6/vZU/NXurFKlPCvjXtB8FLX/nn4//LFYBQAOQPcG oe4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=THlA5NTI//lyv3s+FDTGj24TVhpc+hcbOPPNoSPH/Lk=; b=IjfxWLD2Sy1FDaemgRUwti795b2aXeskaE9984W583x7KcyssUU+QF/9WddZ4RbkuV HoZvwfA0gJcLUl/HJiQ0mgwgKi3tD7p2h6p2inMRapmc8sD/D++lediYG5w5IaTPiOfU xYKtoRlUogbROBY6Ua7txHNRfjDiPlmE+RnCpL5m7rbqWbybksIL4t/4BfFRRLR7lMog jKgck3yrmJ/S1078RZ0MaK0qXMxjGkQAHnuzY+FfGXhLFe7pA1QbKxiVK8zgSF263lLP 9zm9iP1uLDXhrMA2AzWpITWA11tu67n7AJ1VWQ0E3ofqn5djnirCj3iYjWVkF3yyz5cL xWTw== X-Gm-Message-State: APjAAAW+/J24XkW4fbJjrMQxC1iY3ilLg0GUDG4uNcNCDqu3zhW4vR8b FcNvUu/NbOjoI73s7yVat+3FLvyo X-Google-Smtp-Source: APXvYqwtKrhiq0zYmnRSDt4X9vEbWd0XqUAhe3MDnxavwxHczCZEYYQXR5KMMeOFRM49Jh3h6l9ing== X-Received: by 2002:a81:6507:: with SMTP id z7mr18559749ywb.77.1577024542804; Sun, 22 Dec 2019 06:22:22 -0800 (PST) Received: from mail-yw1-f42.google.com (mail-yw1-f42.google.com. [209.85.161.42]) by smtp.gmail.com with ESMTPSA id i72sm6526965ywg.49.2019.12.22.06.22.20 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 22 Dec 2019 06:22:21 -0800 (PST) Received: by mail-yw1-f42.google.com with SMTP id n184so6163742ywc.3 for ; Sun, 22 Dec 2019 06:22:20 -0800 (PST) X-Received: by 2002:a0d:e886:: with SMTP id r128mr18295532ywe.357.1577024540362; Sun, 22 Dec 2019 06:22:20 -0800 (PST) MIME-Version: 1.0 References: <20191220212207.76726-1-adelva@google.com> <20191222080754-mutt-send-email-mst@kernel.org> In-Reply-To: <20191222080754-mutt-send-email-mst@kernel.org> From: Willem de Bruijn Date: Sun, 22 Dec 2019 09:21:43 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH net] virtio-net: Skip set_features on non-cvq devices To: "Michael S. Tsirkin" Cc: Willem de Bruijn , Alistair Delva , Network Development , stable , Jason Wang , "David S . Miller" , kernel-team@android.com, virtualization@lists.linux-foundation.org, linux-kernel Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Note that before the patch that is being fixed the offloads were enabled, but ethtool would show them as off.