[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4c652781-b188-121a-c5a9-75af8788194f@linux.alibaba.com>
Date: Mon, 26 Jun 2023 22:53:08 +0800
From: Heng Qi <hengqi@...ux.alibaba.com>
To: "Michael S. Tsirkin" <mst@...hat.com>
Cc: netdev@...r.kernel.org, bpf@...r.kernel.org,
Jason Wang <jasowang@...hat.com>, Xuan Zhuo <xuanzhuo@...ux.alibaba.com>,
"David S . Miller" <davem@...emloft.net>, Eric Dumazet
<edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, Alexei Starovoitov <ast@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>,
Jesper Dangaard Brouer <hawk@...nel.org>,
John Fastabend <john.fastabend@...il.com>
Subject: Re: [PATCH net-next v3 2/2] virtio-net: remove GUEST_CSUM check for
XDP
在 2023/6/26 下午8:14, Michael S. Tsirkin 写道:
> On Mon, Jun 26, 2023 at 08:03:01PM +0800, Heng Qi wrote:
>> XDP and GUEST_CSUM no longer conflict now, so we removed the
> removed -> remove
Will modify.
Thanks.
>
>> check for GUEST_CSUM for XDP loading/unloading.
>>
>> Signed-off-by: Heng Qi <hengqi@...ux.alibaba.com>
>> Reviewed-by: Xuan Zhuo <xuanzhuo@...ux.alibaba.com>
>> ---
>> v1->v2:
>> - Rewrite the commit log.
>>
>> drivers/net/virtio_net.c | 4 +---
>> 1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
>> index 0a715e0fbc97..2e4bd9a05c85 100644
>> --- a/drivers/net/virtio_net.c
>> +++ b/drivers/net/virtio_net.c
>> @@ -60,7 +60,6 @@ static const unsigned long guest_offloads[] = {
>> VIRTIO_NET_F_GUEST_TSO6,
>> VIRTIO_NET_F_GUEST_ECN,
>> VIRTIO_NET_F_GUEST_UFO,
>> - VIRTIO_NET_F_GUEST_CSUM,
>> VIRTIO_NET_F_GUEST_USO4,
>> VIRTIO_NET_F_GUEST_USO6,
>> VIRTIO_NET_F_GUEST_HDRLEN
>> @@ -3437,10 +3436,9 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,
>> virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO6) ||
>> virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_ECN) ||
>> virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO) ||
>> - virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_CSUM) ||
>> virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_USO4) ||
>> virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_USO6))) {
>> - NL_SET_ERR_MSG_MOD(extack, "Can't set XDP while host is implementing GRO_HW/CSUM, disable GRO_HW/CSUM first");
>> + NL_SET_ERR_MSG_MOD(extack, "Can't set XDP while host is implementing GRO_HW, disable GRO_HW first");
>> return -EOPNOTSUPP;
>> }
>>
>> --
>> 2.19.1.6.gb485710b
Powered by blists - more mailing lists