From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0374FA04F5 for ; Wed, 11 Dec 2019 22:27:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EF1E32C6A; Wed, 11 Dec 2019 22:27:57 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 3C1091BE80 for ; Wed, 11 Dec 2019 22:27:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099676; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3b/mNxEOLfLhu/rtRKswDUempfM3uG0ozeHyN0ldu6c=; b=F0nxgXY0+ktDC2zBtyUPUfuO5q/YA5G8XNBE7IH1pgT4SpG//qu8CtHXoTCc0VehGMp/yk ldiUb3pdX4lpkceLGnwhQM1WS82Un0KrnZQuli5tRtN6EmDg7AbG0eKGKZkxlnw14woZkw H9cvvmhpzLRXYyQiMJMYLrdLhj80M88= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-88-fe6OuhlUP_WQMosk_st4CA-1; Wed, 11 Dec 2019 16:27:53 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 659051005510; Wed, 11 Dec 2019 21:27:52 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60D9310016DA; Wed, 11 Dec 2019 21:27:51 +0000 (UTC) From: Kevin Traynor To: Marvin Liu Cc: Maxime Coquelin , dpdk stable Date: Wed, 11 Dec 2019 21:26:04 +0000 Message-Id: <20191211212702.27851-12-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: fe6OuhlUP_WQMosk_st4CA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/virtio-user: fix setting filters' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/17/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/71ae3517754aa16225= 7988e6c34746ffc20d78aa Thanks. Kevin. --- >From 71ae3517754aa162257988e6c34746ffc20d78aa Mon Sep 17 00:00:00 2001 From: Marvin Liu Date: Wed, 6 Nov 2019 17:02:50 +0800 Subject: [PATCH] net/virtio-user: fix setting filters [ upstream commit a76552d48f17a990662592ff5e13a6e83b62025c ] As doc mentioned, Rx/Mac/vlan filters are all supported by best effort. These control commands should return success. Fixes: f9b9d1a55775 ("net/virtio-user: add multiple queues in device emulat= ion") Signed-off-by: Marvin Liu Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/virtio_user_dev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net= /virtio/virtio_user/virtio_user_dev.c index f0051f887..8e8adf6bb 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -601,4 +601,8 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev= , struct vring *vring, =09=09queues =3D *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr; =09=09status =3D virtio_user_handle_mq(dev, queues); +=09} else if (hdr->class =3D=3D VIRTIO_NET_CTRL_RX || +=09=09 hdr->class =3D=3D VIRTIO_NET_CTRL_MAC || +=09=09 hdr->class =3D=3D VIRTIO_NET_CTRL_VLAN) { +=09=09status =3D 0; =09} =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:13.726213233 +0000 +++ 0012-net-virtio-user-fix-setting-filters.patch=092019-12-11 21:24:12.59= 1652788 +0000 @@ -1 +1 @@ -From a76552d48f17a990662592ff5e13a6e83b62025c Mon Sep 17 00:00:00 2001 +From 71ae3517754aa162257988e6c34746ffc20d78aa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a76552d48f17a990662592ff5e13a6e83b62025c ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16,2 @@ - drivers/net/virtio/virtio_user/virtio_user_dev.c | 8 ++++++++ - 1 file changed, 8 insertions(+) + drivers/net/virtio/virtio_user/virtio_user_dev.c | 4 ++++ + 1 file changed, 4 insertions(+) @@ -19 +20 @@ -index 1c575d0cd..a4400e772 100644 +index f0051f887..8e8adf6bb 100644 @@ -22 +23 @@ -@@ -614,4 +614,8 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *de= v, struct vring *vring, +@@ -601,4 +601,8 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *de= v, struct vring *vring, @@ -24,9 +24,0 @@ - =09=09status =3D virtio_user_handle_mq(dev, queues); -+=09} else if (hdr->class =3D=3D VIRTIO_NET_CTRL_RX || -+=09=09 hdr->class =3D=3D VIRTIO_NET_CTRL_MAC || -+=09=09 hdr->class =3D=3D VIRTIO_NET_CTRL_VLAN) { -+=09=09status =3D 0; - =09} -=20 -@@ -665,4 +669,8 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_= dev *dev, - =09=09=09=09vring->desc[idx_data].addr;