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 384DCA04F3 for ; Thu, 19 Dec 2019 15:38:31 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2E6861BF7B; Thu, 19 Dec 2019 15:38:31 +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 C26CF1BFBD for ; Thu, 19 Dec 2019 15:38:29 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id p9so5678330wmc.2 for ; Thu, 19 Dec 2019 06:38:29 -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=5yHIT7UpeR8twYpW53P/wW36uQa1pdKaplzjFYmsNnU=; b=P+UkDNs2qzq1tov/PwdGYIqBxkKWKqwSS0UlW95MF65qMe1luegoEHMKkZjkeI00Ob drcSEwmMYeELFA/rWUM28oSGUksqYkNDrH2W3KPoFQXPg7gBqgUixtjTgcY/mswPdxDL Y4xUbdGuAF/cWCX4oTjh3lJvuWEg+doipvAPq8Lv65nqMYHkjDhBHC3OXYrL1dssgdtx OG62SI7VX0pu4NHh7kyDSXZWmxHb/uGnF0QyZU3zMKJcw1sVT6heO2qYEo9FfBsED7kZ HUmuHMjS1yjBQ14pqfE/5kdrkfVimc7Fho0tH6pOPKTxrKDmERucBlFS/aQgjcn8sTyT xOFg== 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=5yHIT7UpeR8twYpW53P/wW36uQa1pdKaplzjFYmsNnU=; b=h56TceeZnztakBziSM71mzQdNNaTmLqwpITB0ve3u8N+A06kfrbQ59S5t926etiZ8A QU2R/IR+Kno4bAdaP3Sp4lA9cfmDVsS7s26t6dciZOIuaP0/Rcm76s/oUryR/ie2HU5+ 0Nu0FomJLUbqZM+Sc7anQVX0byurLF3iymsGjwKXsWhvXTTjHxSqRzro+e7Wh9IghkEi jhJ2Zp73AkdhjA8Rr8eBpSCqWwCgwpJdp7sC+SfEygdpi+SQ6D3HRjTMXXfam7EeTuF2 FhjJ/Sjpb0pBJPkaphS8SrkeVLlQuidZBC8BTG26RK6mxVPYO4TGHdlHS9hHnAQZUR34 7w0Q== X-Gm-Message-State: APjAAAU4Rz/SiKZMWwZtMgqH7Nn36IP0gT8MEn7UcsKuiQBjQdfD/2U7 OUFZqlHe7RrB/8ux509s7mvC+36B9tw= X-Google-Smtp-Source: APXvYqw7moFe7mG8dBx6cZwT6yabNepvphPvNlhz9jaKBxYfjbivIhZKajsmw9a63tW60CDNU7jnPQ== X-Received: by 2002:a05:600c:224a:: with SMTP id a10mr10671669wmm.143.1576766309507; Thu, 19 Dec 2019 06:38:29 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t190sm6371689wmt.44.2019.12.19.06.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:38:29 -0800 (PST) From: luca.boccassi@gmail.com To: Dilshod Urazov Cc: Andrew Rybchenko , Maxime Coquelin , dpdk stable Date: Thu, 19 Dec 2019 14:33:51 +0000 Message-Id: <20191219143447.21506-84-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 Rx 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 4ffa05031dc3ef78fc6037472e34fd6e520a56b3 Mon Sep 17 00:00:00 2001 From: Dilshod Urazov Date: Wed, 9 Oct 2019 13:32:05 +0100 Subject: [PATCH] net/virtio: reject deferred Rx start [ upstream commit 955d7c1f03d049b2018db3d2c4a78920368d7aa3 ] Deferred start Rx 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: Maxime Coquelin --- drivers/net/virtio/virtio_rxtx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index c608575722..90bc2c2298 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -421,7 +421,7 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, unsigned int socket_id __rte_unused, - __rte_unused const struct rte_eth_rxconf *rx_conf, + const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp) { uint16_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_RQ_QUEUE_IDX; @@ -431,6 +431,11 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, PMD_INIT_FUNC_TRACE(); + if (rx_conf->rx_deferred_start) { + PMD_INIT_LOG(ERR, "Rx deferred start is not supported"); + 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); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:29.707626710 +0000 +++ 0084-net-virtio-reject-deferred-Rx-start.patch 2019-12-19 14:32:26.201299729 +0000 @@ -1,12 +1,13 @@ -From 955d7c1f03d049b2018db3d2c4a78920368d7aa3 Mon Sep 17 00:00:00 2001 +From 4ffa05031dc3ef78fc6037472e34fd6e520a56b3 Mon Sep 17 00:00:00 2001 From: Dilshod Urazov Date: Wed, 9 Oct 2019 13:32:05 +0100 Subject: [PATCH] net/virtio: reject deferred Rx start +[ upstream commit 955d7c1f03d049b2018db3d2c4a78920368d7aa3 ] + Deferred start Rx 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 @@ -16,19 +17,19 @@ 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c -index b5fc4ecbe1..405c313f20 100644 +index c608575722..90bc2c2298 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c -@@ -929,7 +929,7 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -421,7 +421,7 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, unsigned int socket_id __rte_unused, -- const struct rte_eth_rxconf *rx_conf __rte_unused, +- __rte_unused const struct rte_eth_rxconf *rx_conf, + const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp) { uint16_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_RQ_QUEUE_IDX; -@@ -939,6 +939,11 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -431,6 +431,11 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, PMD_INIT_FUNC_TRACE();