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 50001A04F3 for ; Thu, 19 Dec 2019 15:38:35 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 432971BF7B; Thu, 19 Dec 2019 15:38:35 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 662C01BF7B for ; Thu, 19 Dec 2019 15:38:34 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id c9so6210547wrw.8 for ; Thu, 19 Dec 2019 06:38:34 -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=yEP827gD3AThkIHpOvDIlLDYoW+8aJ+HwmaJLdOtKRg=; b=BmHmV8R9g2IYqmuluYxbzYCsiXN8Zmb66g3/7FBS39VQR2C94dukyuPLYawA6clsFw FK4q+kiTb7vZfgpH6JnTBvqkPtSLGJoQqsKuBMgdcAQ0ESIj1sik3zMOMTIo4Y8FxnOl DU7yHDQx+r4zbyCLRnDT0Lra2mW+tuOPjsGAkFeDwNf/GL4m8eCk7QPLhajQ/tuM3dtQ mEEPYogq3uY/O8gWvloUa5rvN5CPEjm69NtRgPh1hDnXxgZygeNUb1tVT3IQYKqJ8t+0 N/4WFPggznOXK8ZDAC6tLXE4ba2pMeIFPyDAfS/Zcn/IIcRDMvXvjD/MafRFfjk3gDE+ eeLQ== 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=yEP827gD3AThkIHpOvDIlLDYoW+8aJ+HwmaJLdOtKRg=; b=WiuxOlOEVPSe00zVxNt28DyZ40heq9YHI9vWmM3dzwp/lvXRf4VkUq4OlS5NbKNPnE PW0xmmH5OBNijiPe7XL53WN1R6jGd1xoFvxybrlcJkOlH9X10pOE4P0sLwHIaTVe52dT 4KNCE28nN5d2mM2FGedZnBDl+NwCJgKsIxxH4A71IU5pBjXMx2nw8Z3JCArFv2VVJnE9 o/dZXgL2oyGSR27qfjTHF8Zp23ynPfAonNUCNpwzWAgh8CdcG4lyZnA72uvN8WbNxi9a bJX4VGkbBLaiP1BkFUgQH99x1P6UkDMTOue0oJl6Pre7uzIzUAdik0X3lB+WHWUJGgUX QBpw== X-Gm-Message-State: APjAAAV4RXErWW0h+YriWnef+Ir+QxsvjfmhB0PdsUWQGVlqBOT0IJH1 XjfLOMB6h5usBfVy5ZEy1AA= X-Google-Smtp-Source: APXvYqy6dYWRsH6hh81mkdhwirw5Guu4Cvw2Lb0Cpoibgu6CDFqN/HVKv/oBgAWLq5UFW+9LdmdAkQ== X-Received: by 2002:adf:e70d:: with SMTP id c13mr9919076wrm.248.1576766314155; Thu, 19 Dec 2019 06:38:34 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c68sm6351031wme.13.2019.12.19.06.38.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:38:33 -0800 (PST) From: luca.boccassi@gmail.com To: Dilshod Urazov Cc: Andrew Rybchenko , Tiwei Bie , Maxime Coquelin , dpdk stable Date: Thu, 19 Dec 2019 14:33:52 +0000 Message-Id: <20191219143447.21506-85-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: reject deferred Tx start' 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 2232241936628e186a11d3895f2c178f2b6b65e6 Mon Sep 17 00:00:00 2001 From: Dilshod Urazov Date: Wed, 9 Oct 2019 13:32:06 +0100 Subject: [PATCH] net/virtio: reject deferred Tx start [ upstream commit c0e03310ee90c5d7aff9fffb243f3374f0b0cd61 ] Deferred start Tx queue is not supported by the driver. Fixes: 0748be2cf9a2 ("ethdev: queue start and stop") Signed-off-by: Dilshod Urazov Signed-off-by: Andrew Rybchenko Reviewed-by: Tiwei Bie Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_rxtx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 90bc2c2298..2d00a9444e 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -538,6 +538,11 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, PMD_INIT_FUNC_TRACE(); + if (tx_conf->tx_deferred_start) { + PMD_INIT_LOG(ERR, "Tx deferred start is not supported"); + return -EINVAL; + } + /* cannot use simple rxtx funcs with multisegs or offloads */ if ((tx_conf->txq_flags & VIRTIO_SIMPLE_FLAGS) != VIRTIO_SIMPLE_FLAGS) hw->use_simple_tx = 0; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:29.745141682 +0000 +++ 0085-net-virtio-reject-deferred-Tx-start.patch 2019-12-19 14:32:26.205299809 +0000 @@ -1,12 +1,13 @@ -From c0e03310ee90c5d7aff9fffb243f3374f0b0cd61 Mon Sep 17 00:00:00 2001 +From 2232241936628e186a11d3895f2c178f2b6b65e6 Mon Sep 17 00:00:00 2001 From: Dilshod Urazov Date: Wed, 9 Oct 2019 13:32:06 +0100 Subject: [PATCH] net/virtio: reject deferred Tx start +[ upstream commit c0e03310ee90c5d7aff9fffb243f3374f0b0cd61 ] + Deferred start Tx queue is not supported by the driver. Fixes: 0748be2cf9a2 ("ethdev: queue start and stop") -Cc: stable@dpdk.org Signed-off-by: Dilshod Urazov Signed-off-by: Andrew Rybchenko @@ -17,10 +18,10 @@ 1 file changed, 5 insertions(+) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c -index 405c313f20..0959250a33 100644 +index 90bc2c2298..2d00a9444e 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c -@@ -1067,6 +1067,11 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, +@@ -538,6 +538,11 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, PMD_INIT_FUNC_TRACE(); @@ -29,9 +30,9 @@ + return -EINVAL; + } + - if (nb_desc == 0 || nb_desc > vq->vq_nentries) - nb_desc = vq->vq_nentries; - vq->vq_free_cnt = RTE_MIN(vq->vq_free_cnt, nb_desc); + /* cannot use simple rxtx funcs with multisegs or offloads */ + if ((tx_conf->txq_flags & VIRTIO_SIMPLE_FLAGS) != VIRTIO_SIMPLE_FLAGS) + hw->use_simple_tx = 0; -- 2.20.1