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 50A3BA04F0 for ; Thu, 19 Dec 2019 15:41:41 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 47ACA1BFFE; Thu, 19 Dec 2019 15:41:41 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 64F241BFFE for ; Thu, 19 Dec 2019 15:41:40 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id q9so5692324wmj.5 for ; Thu, 19 Dec 2019 06:41:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b0jycemUgtKxvttP22pNXZH77tosseyKCzsxWo0BlLY=; b=dxszuBDbnW0fyBB11/JH+4I+qlQ4MQxrfEeOnjOeOymSCb+ik7AfYQFi9N5srHnSIy nJWbD4t8442PiS3nx6u+8dVJnmqXaS79F5tsiVdbhDRYst3MrlCPG0P3yB+JsLYFSa7R hVb7h04Q+n34/u3I+lhAk0C9X1hfXqculBIKID3ehYewN2tCSI1ToI5UH0EosHj7HAFF b3Foa/PO5hn1sNiKCd0JudsYG36yS/RbVMxZeXczXZDqozOgli5mhxo9GRLqTrULuqwM 3b7lLyzdJN+bytdS5hjgVRORQrSVAw2MuN1pPE7E+t8BR1j4xclfsvYzSPgvivoBq8pD qNXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b0jycemUgtKxvttP22pNXZH77tosseyKCzsxWo0BlLY=; b=LQ8ambYO+LUofNLqXTB3G3ILajkMS9QWP3uXmFe62awuO4VcvF5jRWYGcKX0lqbr0i aWyYKW8caQupbbvrwO7uCCraJHnICoBzl0BH6H7VFES2TiQ2PsbjtPysWzxqNcoHyAD0 vjFQqLQK+uw5TVDD5KxXraY1LdCLySJVjtQ04xV7PK5E40mqAUlkaxtJuTgK2Uwd+6wI GzYhF92cZOPSdVJE1vmatebTE8g/+U2RndOLHMzzyvUF4Vw9nB99nqL/KsSbn9IP0IVA 88r+y4hH341hl+Oz5AxtkWoz4qMZcKalRSz4UlBzY+kWkCVA6TuhwI7dYJ4aL2907Kp4 KvZg== X-Gm-Message-State: APjAAAViDFC6u4X9mX9zads9OhxJaK6ivTlnixEkNErPSrI/hSLDgsxg 420AgYvbyeY85ZBM7xOEqu+KIDRM4a8= X-Google-Smtp-Source: APXvYqzn+tQFUOWYhjdOF13FiVLD3DVkckwFmj59dKd0WbSgfSR5J+kENlH+jXWyIRk6y0WxgHI2Gw== X-Received: by 2002:a1c:4b09:: with SMTP id y9mr10810958wma.103.1576766500153; Thu, 19 Dec 2019 06:41:40 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id k11sm6311667wmc.20.2019.12.19.06.41.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:41:39 -0800 (PST) From: luca.boccassi@gmail.com To: Marvin Liu Cc: Maxime Coquelin , dpdk stable Date: Thu, 19 Dec 2019 14:34:22 +0000 Message-Id: <20191219143447.21506-115-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio-user: fix setting filters' has been queued to LTS release 17.11.10 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 17.11.10 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/21/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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From e3ecf90edcff2b29658dc2dc37347b6e0bba3abf 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 emulation") 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 23510a9906..95433f7c43 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -484,6 +484,10 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring, queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr; status = virtio_user_handle_mq(dev, queues); + } else if (hdr->class == VIRTIO_NET_CTRL_RX || + hdr->class == VIRTIO_NET_CTRL_MAC || + hdr->class == VIRTIO_NET_CTRL_VLAN) { + status = 0; } /* Update status */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:30.903299430 +0000 +++ 0115-net-virtio-user-fix-setting-filters.patch 2019-12-19 14:32:26.289301474 +0000 @@ -1,41 +1,31 @@ -From a76552d48f17a990662592ff5e13a6e83b62025c Mon Sep 17 00:00:00 2001 +From e3ecf90edcff2b29658dc2dc37347b6e0bba3abf 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 emulation") -Cc: stable@dpdk.org Signed-off-by: Marvin Liu Reviewed-by: Maxime Coquelin --- - 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(+) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c -index 1c575d0cdd..a4400e7720 100644 +index 23510a9906..95433f7c43 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c -@@ -613,6 +613,10 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring, +@@ -484,6 +484,10 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring, queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr; status = virtio_user_handle_mq(dev, queues); + } else if (hdr->class == VIRTIO_NET_CTRL_RX || + hdr->class == VIRTIO_NET_CTRL_MAC || -+ hdr->class == VIRTIO_NET_CTRL_VLAN) { -+ status = 0; - } - - /* Update status */ -@@ -664,6 +668,10 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev, - queues = *(uint16_t *)(uintptr_t) - vring->desc[idx_data].addr; - status = virtio_user_handle_mq(dev, queues); -+ } else if (hdr->class == VIRTIO_NET_CTRL_RX || -+ hdr->class == VIRTIO_NET_CTRL_MAC || + hdr->class == VIRTIO_NET_CTRL_VLAN) { + status = 0; }