From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 135E442CBC for ; Thu, 15 Jun 2023 03:34:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E8C742D3C; Thu, 15 Jun 2023 03:34:12 +0200 (CEST) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id BE65740DDA for ; Thu, 15 Jun 2023 03:34:10 +0200 (CEST) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-31114b46d62so195862f8f.3 for ; Wed, 14 Jun 2023 18:34:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792850; x=1689384850; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CWFyJebb+TuNTo/gHppDEgBvT6ydXhA+fwf/2/74n34=; b=CSIVM0IjqJ+RppLk1/hVJceI1oEpxypWlRF0zQY17YAMQJ4r6FfvwPtWfI8UFXKHlX SYiZ+8BXwxzzVzb6GjPKbBT/ws3FZ0aUliWroTNNMPE0d2qC9LZRS5E9xQBZs7PW5YAO kRwiI1l7+B+yC/HR3Glp2khNlXerQxXHl9QfFN+ikZLOkB6AaAFw/DU4sLzNd1NXRMxS bWD3MG8hDN2yimcLEzo4weMSr7IQHIkSc34lGocv2fTOFEa5cWQ96MeZC4bDwKwnksrD z+Y4tVVmNborBhFTJqk2feNUNuz42g3jJMDgewT4xohHw7kp2yOwNAoZ2BUy8VuOaAyf gXqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792850; x=1689384850; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CWFyJebb+TuNTo/gHppDEgBvT6ydXhA+fwf/2/74n34=; b=OKP+bxlzNEzlUXWtyb241XNAGr1DPwROzFmbCPSm5kZnuYyV1yBKw5fU3iBUaomcMj Q6xzMM3mD5+WaqVaAVwBPz+RZnelVdMpEjaMlqNfX9Q4CNXzb4QqSPZZGmsKGUUHkPRj IGjPlrHqEhfR8LMUrzcI7jLAVgN+Er8CgPJ3jSm3e/UgeSgUH0LhV60qPpeLOaZua2Vt Uu9Rsk/tuSR9nH3coZ4jJgi+T5TttHwthLG/n3AmSjokxAuITiYg62mOoQHKHisJyp6n oWq/qGM1F6shL0lgiPRz/VGwzeWbmfiUU4npHFnwRNdGZ9vJ7sIsFotaBp08auDQyCgM RSmQ== X-Gm-Message-State: AC+VfDyMMVukJyhwQergI2d7IfkqELr5xF2S7SRLRAL1s75Z5KVa8XVd FObWIc5Xh6YUSdUx8vri9FAGUZoLev9H2CBt X-Google-Smtp-Source: ACHHUZ5xWn8QqhB1jNiDjEhym9EH43g3lDOqna66Fx3nXmS1TD/h8i+/cwKT0iW0MN728ulLoZNbAw== X-Received: by 2002:a5d:6ac6:0:b0:30e:6168:90dd with SMTP id u6-20020a5d6ac6000000b0030e616890ddmr11666254wrw.25.1686792850436; Wed, 14 Jun 2023 18:34:10 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id c2-20020a5d5282000000b002fae7408544sm19609483wrv.108.2023.06.14.18.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:34:10 -0700 (PDT) From: luca.boccassi@gmail.com To: Ronak Doshi Cc: Jochen Behrens , dpdk stable Subject: patch 'net/vmxnet3: fix drop of empty segments in Tx' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:19 +0100 Message-Id: <20230615013258.1439718-24-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 20.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/17/23. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/798cbf1de5b99243415347b49f97fc6f799a5998 Thanks. Luca Boccassi --- >From 798cbf1de5b99243415347b49f97fc6f799a5998 Mon Sep 17 00:00:00 2001 From: Ronak Doshi Date: Mon, 8 May 2023 19:21:06 -0700 Subject: [PATCH] net/vmxnet3: fix drop of empty segments in Tx [ upstream commit b44f3e1381f3910be50d03c784f5c073c25245dd ] When empty segments are dropped, some descriptor variable values are updated in the segment processing loop before it is exited. This can lead to a wedged queue where all subsequent packets are dropped for this queue. Also move the check for empty packet to catch the case of a zero length packet with multiple segments. Fixes: d863f19efa4f ("net/vmxnet3: skip empty segments in transmission") Signed-off-by: Ronak Doshi Acked-by: Jochen Behrens --- drivers/net/vmxnet3/vmxnet3_rxtx.c | 33 +++++++++++++++++------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index 40b366854d..91bcfcd6fd 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -413,8 +413,8 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, nb_tx = 0; while (nb_tx < nb_pkts) { - Vmxnet3_GenericDesc *gdesc; - vmxnet3_buf_info_t *tbi; + Vmxnet3_GenericDesc *gdesc = NULL; + vmxnet3_buf_info_t *tbi = NULL; uint32_t first2fill, avail, dw2; struct rte_mbuf *txm = tx_pkts[nb_tx]; struct rte_mbuf *m_seg = txm; @@ -458,18 +458,18 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, continue; } + /* Skip empty packets */ + if (unlikely(rte_pktmbuf_pkt_len(txm) == 0)) { + txq->stats.drop_total++; + rte_pktmbuf_free(txm); + nb_tx++; + continue; + } + if (txm->nb_segs == 1 && rte_pktmbuf_pkt_len(txm) <= txq->txdata_desc_size) { struct Vmxnet3_TxDataDesc *tdd; - /* Skip empty packets */ - if (unlikely(rte_pktmbuf_pkt_len(txm) == 0)) { - txq->stats.drop_total++; - rte_pktmbuf_free(txm); - nb_tx++; - continue; - } - tdd = (struct Vmxnet3_TxDataDesc *) ((uint8 *)txq->data_ring.base + txq->cmd_ring.next2fill * @@ -482,6 +482,10 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, dw2 = (txq->cmd_ring.gen ^ 0x1) << VMXNET3_TXD_GEN_SHIFT; first2fill = txq->cmd_ring.next2fill; do { + /* Skip empty segments */ + if (unlikely(m_seg->data_len == 0)) + continue; + /* Remember the transmit buffer for cleanup */ tbi = txq->cmd_ring.buf_info + txq->cmd_ring.next2fill; @@ -491,10 +495,6 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, */ gdesc = txq->cmd_ring.base + txq->cmd_ring.next2fill; - /* Skip empty segments */ - if (unlikely(m_seg->data_len == 0)) - continue; - if (copy_size) { uint64 offset = (uint64)txq->cmd_ring.next2fill * @@ -515,6 +515,11 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, /* use the right gen for non-SOP desc */ dw2 = txq->cmd_ring.gen << VMXNET3_TXD_GEN_SHIFT; } while ((m_seg = m_seg->next) != NULL); + /* We must have executed the complete preceding loop at least + * once without skipping an empty segment, as we can't have + * a packet with only empty segments. + * Thus, tbi and gdesc have been initialized. + */ /* set the last buf_info for the pkt */ tbi->m = txm; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:36.031399370 +0100 +++ 0024-net-vmxnet3-fix-drop-of-empty-segments-in-Tx.patch 2023-06-15 01:56:34.555541041 +0100 @@ -1 +1 @@ -From b44f3e1381f3910be50d03c784f5c073c25245dd Mon Sep 17 00:00:00 2001 +From 798cbf1de5b99243415347b49f97fc6f799a5998 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b44f3e1381f3910be50d03c784f5c073c25245dd ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 39ad0726cb..148f65383e 100644 +index 40b366854d..91bcfcd6fd 100644 @@ -27 +28 @@ -@@ -418,8 +418,8 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -413,8 +413,8 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, @@ -38 +39 @@ -@@ -465,18 +465,18 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -458,18 +458,18 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, @@ -65 +66 @@ -@@ -489,6 +489,10 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -482,6 +482,10 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, @@ -76 +77 @@ -@@ -498,10 +502,6 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -491,10 +495,6 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, @@ -87 +88 @@ -@@ -522,6 +522,11 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -515,6 +515,11 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,