From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752196AbcKGJRo (ORCPT ); Mon, 7 Nov 2016 04:17:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54532 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750927AbcKGJRn (ORCPT ); Mon, 7 Nov 2016 04:17:43 -0500 Subject: Re: [PATCH] virtio-net: drop legacy features in virtio 1 mode To: "Michael S. Tsirkin" , linux-kernel@vger.kernel.org References: <1478256865-29003-1-git-send-email-mst@redhat.com> Cc: stable@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org From: Jason Wang Message-ID: <64fb12f5-3724-f35b-1a83-44e4ae2d0f20@redhat.com> Date: Mon, 7 Nov 2016 17:17:38 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1478256865-29003-1-git-send-email-mst@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 07 Nov 2016 09:17:43 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2016年11月04日 18:55, Michael S. Tsirkin wrote: > Virtio 1.0 spec says VIRTIO_F_ANY_LAYOUT and VIRTIO_NET_F_GSO are > legacy-only feature bits. Do not negotiate them in virtio 1 mode. Note > this is a spec violation so we need to backport it to stable/downstream > kernels. > > Cc: stable@vger.kernel.org > Signed-off-by: Michael S. Tsirkin > --- > drivers/net/virtio_net.c | 30 ++++++++++++++++++++---------- > 1 file changed, 20 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 7a00365..b19fb4d 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -2089,23 +2089,33 @@ static struct virtio_device_id id_table[] = { > { 0 }, > }; > > +#define VIRTNET_FEATURES \ > + VIRTIO_NET_F_CSUM, VIRTIO_NET_F_GUEST_CSUM, \ > + VIRTIO_NET_F_MAC, \ > + VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_HOST_TSO6, \ > + VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6, \ > + VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_UFO, \ > + VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ, \ > + VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN, \ > + VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, \ > + VIRTIO_NET_F_CTRL_MAC_ADDR, \ > + VIRTIO_NET_F_MTU > + > static unsigned int features[] = { > - VIRTIO_NET_F_CSUM, VIRTIO_NET_F_GUEST_CSUM, > - VIRTIO_NET_F_GSO, VIRTIO_NET_F_MAC, > - VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_HOST_TSO6, > - VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6, > - VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_UFO, > - VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ, > - VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN, > - VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, > - VIRTIO_NET_F_CTRL_MAC_ADDR, > + VIRTNET_FEATURES, > +}; > + > +static unsigned int features_legacy[] = { > + VIRTNET_FEATURES, > + VIRTIO_NET_F_GSO, > VIRTIO_F_ANY_LAYOUT, > - VIRTIO_NET_F_MTU, > }; > > static struct virtio_driver virtio_net_driver = { > .feature_table = features, > .feature_table_size = ARRAY_SIZE(features), > + .feature_table_legacy = features_legacy, > + .feature_table_size_legacy = ARRAY_SIZE(features_legacy), > .driver.name = KBUILD_MODNAME, > .driver.owner = THIS_MODULE, > .id_table = id_table, Acked-by: Jason Wang