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 56486A04F0 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 42C7F1BE9E; Tue, 10 Dec 2019 16:00:55 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 4E7561BE9D 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=1575990052; 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=K5q6ZUwiPtloUZ4Tc7lXCsqJ/p51BvVOqH87OZtGlug=; b=YvdatHrAdLentNa0j+EffsDHzAuPCquWz4NQpKGr2QFRU5vf8ObNAIyxgy+6NkYOsIOJoh bevEdu240jcxcXCfZ4D84eFhBFN1nzXjNzmIFD8UDRdtEf3LyoEtOIFiYueXb0Xh0Wamxw IByv+W6umR3AHv1OO283QelijsRqiG0= 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-120-8gr_wyuHMzmoPM42KnWvWg-1; Tue, 10 Dec 2019 10:00:49 -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 9E810911F7; Tue, 10 Dec 2019 15:00:48 +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 A98AA5D9C5; Tue, 10 Dec 2019 15:00:47 +0000 (UTC) From: Kevin Traynor To: Andrew Rybchenko Cc: Maxime Coquelin , dpdk stable Date: Tue, 10 Dec 2019 14:59:04 +0000 Message-Id: <20191210145937.32755-30-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: 8gr_wyuHMzmoPM42KnWvWg-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 Tx 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/9b86e7fb843021c6dd= bcc5a2fe46e685968893b8 Thanks. Kevin. --- >From 9b86e7fb843021c6ddbcc5a2fe46e685968893b8 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Wed, 9 Oct 2019 13:32:08 +0100 Subject: [PATCH] net/virtio: reject unsupported Tx multi-queue modes [ upstream commit 9fc963acc26f31c46e4c7f8527b60fa2e5505f8f ] This driver supports none of DCB or VMDQ modes, therefore must check and return error if configured incorrectly. Fixes: c1f86306a026 ("virtio: add new driver") 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 634e56817..2d4c6c7fa 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1874,4 +1874,11 @@ virtio_dev_configure(struct rte_eth_dev *dev) =09} =20 +=09if (txmode->mq_mode !=3D ETH_MQ_TX_NONE) { +=09=09PMD_DRV_LOG(ERR, +=09=09=09"Unsupported Tx multi queue mode %d", +=09=09=09txmode->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.145399449 +0000 +++ 0030-net-virtio-reject-unsupported-Tx-multi-queue-modes.patch=092019-12= -10 14:49:39.044457917 +0000 @@ -1 +1 @@ -From 9fc963acc26f31c46e4c7f8527b60fa2e5505f8f Mon Sep 17 00:00:00 2001 +From 9b86e7fb843021c6ddbcc5a2fe46e685968893b8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9fc963acc26f31c46e4c7f8527b60fa2e5505f8f ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 76bd40a3e..646de9945 100644 +index 634e56817..2d4c6c7fa 100644 @@ -22 +23 @@ -@@ -2074,4 +2074,11 @@ virtio_dev_configure(struct rte_eth_dev *dev) +@@ -1874,4 +1874,11 @@ virtio_dev_configure(struct rte_eth_dev *dev)