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 7D3E7A04F0 for ; Tue, 10 Dec 2019 16:00:55 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6A4201BF31; Tue, 10 Dec 2019 16:00:55 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 7EFE41BE9E for ; Tue, 10 Dec 2019 16:00:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990053; 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=KSLPealWrVtnzTr54ThnFOFvBNkdNddA6V1giQySZQI=; b=Dy3QFKEEdlnYyhLFw84icQvSuSZPDQynw9nvNWf62xSpHqJYlzPplPfStSzMQGBE+CMGmc cscYK0PlWNSepoFxEC7wwYt0fHTmYXNYCrLv6HuqONNvMBvN8StZzVZaJR84WfuPLMlChR hSK5Fkr57Y3DnCxDI2UrvJSFEwbT38c= 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-360-XujnUoUGOBWw62pZsaMnxw-1; Tue, 10 Dec 2019 10:00:48 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4ED46107ACC7; Tue, 10 Dec 2019 15:00:47 +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 27FB05D9C5; Tue, 10 Dec 2019 15:00:45 +0000 (UTC) From: Kevin Traynor To: Dilshod Urazov Cc: Andrew Rybchenko , Maxime Coquelin , dpdk stable Date: Tue, 10 Dec 2019 14:59:03 +0000 Message-Id: <20191210145937.32755-29-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: XujnUoUGOBWw62pZsaMnxw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/virtio: reject unsupported Rx multi-queue modes' 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/16/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/20accec1aa2a33845d= bac155b96181b68927e75e Thanks. Kevin. --- >From 20accec1aa2a33845dbac155b96181b68927e75e Mon Sep 17 00:00:00 2001 From: Dilshod Urazov Date: Wed, 9 Oct 2019 13:32:07 +0100 Subject: [PATCH] net/virtio: reject unsupported Rx multi-queue modes [ upstream commit 13b3137f3b7c8f866947a9b34e06a8aec0d084f7 ] This driver supports none of DCB, RSS or VMDQ modes, therefore must check and return error if configured incorrectly. Virtio can distribute Rx packets across multi-queue, but there is no controls (algorithm, redirection table, hash function) except number of Rx queues and ETH_MQ_RX_NONE is the best fit meaning no method is enforced on how to route packets to MQs. Fixes: c1f86306a026 ("virtio: add new driver") Signed-off-by: Dilshod Urazov Signed-off-by: Andrew Rybchenko Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_ethdev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio= _ethdev.c index 8c54edc28..634e56817 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1867,4 +1867,11 @@ virtio_dev_configure(struct rte_eth_dev *dev) =09req_features =3D VIRTIO_PMD_DEFAULT_GUEST_FEATURES; =20 +=09if (rxmode->mq_mode !=3D ETH_MQ_RX_NONE) { +=09=09PMD_DRV_LOG(ERR, +=09=09=09"Unsupported Rx multi queue mode %d", +=09=09=09rxmode->mq_mode); +=09=09return -EINVAL; +=09} + =09if (dev->data->dev_conf.intr_conf.rxq) { =09=09ret =3D virtio_init_device(dev, hw->req_guest_features); --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:41.083295473 +0000 +++ 0029-net-virtio-reject-unsupported-Rx-multi-queue-modes.patch=092019-12= -10 14:49:39.040457991 +0000 @@ -1 +1 @@ -From 13b3137f3b7c8f866947a9b34e06a8aec0d084f7 Mon Sep 17 00:00:00 2001 +From 20accec1aa2a33845dbac155b96181b68927e75e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 13b3137f3b7c8f866947a9b34e06a8aec0d084f7 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 0a2ed2e50..76bd40a3e 100644 +index 8c54edc28..634e56817 100644 @@ -28 +29 @@ -@@ -2067,4 +2067,11 @@ virtio_dev_configure(struct rte_eth_dev *dev) +@@ -1867,4 +1867,11 @@ virtio_dev_configure(struct rte_eth_dev *dev)