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 6CD4EA0093 for ; Thu, 28 May 2020 18:26:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 62B3A1DC2A; Thu, 28 May 2020 18:26:08 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 465A21DC10 for ; Thu, 28 May 2020 18:26:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683166; 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=t+omT44EavOTEKDBMEUM9vcgfnUfa3KtuZBbChj+Jvw=; b=XJsR+BuJg4LiAMR0s9odBn+QR51qW5GaRsb214wLlvitDXmK9ueIDPk7WvMjYrqNGvZUPq Yfta2IpgOmBotGxeTqGayYXgGQ1QNp40zAUyDndLyEu0/xAIq0jcP8vALXRbOXnZ9DLCHW ELAndyi6HnV50CC5qfNtKsm4YfUR+SM= 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-508-GwTANfXUNjK9iyHM7TDYqQ-1; Thu, 28 May 2020 12:26:03 -0400 X-MC-Unique: GwTANfXUNjK9iyHM7TDYqQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9217018FE867; Thu, 28 May 2020 16:26:02 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8282B60C87; Thu, 28 May 2020 16:26:01 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Ferruh Yigit , Stephen Hemminger , dpdk stable Date: Thu, 28 May 2020 17:23:07 +0100 Message-Id: <20200528162322.7863-80-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/tap: fix check for mbuf number of segment' has been queued to LTS release 18.11.9 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.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/03/20. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/782d5424188706c305cc9ebb838b341a9aba811f Thanks. Kevin. --- >From 782d5424188706c305cc9ebb838b341a9aba811f Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Thu, 16 Apr 2020 11:04:35 +0800 Subject: [PATCH] net/tap: fix check for mbuf number of segment [ upstream commit cc6cf04f59ec20757990b3e8586b7c3a7f497720 ] Now the rxq->pool is mbuf concatenation, but its nb_segs is 1. When conducting some sanity checks on the mbuf with debug enabled, it fails. Fixes: 0781f5762cfe ("net/tap: support segmented mbufs") Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit Acked-by: Stephen Hemminger --- drivers/net/tap/rte_eth_tap.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index c6cfb4c683..5b486dacfc 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -341,4 +341,21 @@ tap_rx_offload_get_queue_capa(void) } +static void +tap_rxq_pool_free(struct rte_mbuf *pool) +{ + struct rte_mbuf *mbuf = pool; + uint16_t nb_segs = 1; + + if (mbuf == NULL) + return; + + while (mbuf->next) { + mbuf = mbuf->next; + nb_segs++; + } + pool->nb_segs = nb_segs; + rte_pktmbuf_free(pool); +} + /* Callback to handle the rx burst of packets to the correct interface and * file descriptor(s) in a multi-queue setup. @@ -391,5 +408,5 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) seg->next = NULL; - rte_pktmbuf_free(mbuf); + tap_rxq_pool_free(mbuf); goto end; @@ -1023,5 +1040,5 @@ tap_dev_close(struct rte_eth_dev *dev) close(process_private->rxq_fds[i]); process_private->rxq_fds[i] = -1; - rte_pktmbuf_free(rxq->pool); + tap_rxq_pool_free(rxq->pool); rte_free(rxq->iovecs); rxq->pool = NULL; @@ -1062,5 +1079,5 @@ tap_rx_queue_release(void *queue) close(process_private->rxq_fds[rxq->queue_id]); process_private->rxq_fds[rxq->queue_id] = -1; - rte_pktmbuf_free(rxq->pool); + tap_rxq_pool_free(rxq->pool); rte_free(rxq->iovecs); rxq->pool = NULL; @@ -1406,5 +1423,5 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, error: - rte_pktmbuf_free(rxq->pool); + tap_rxq_pool_free(rxq->pool); rxq->pool = NULL; rte_free(rxq->iovecs); -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:03.247254392 +0100 +++ 0080-net-tap-fix-check-for-mbuf-number-of-segment.patch 2020-05-28 17:12:59.166554929 +0100 @@ -1 +1 @@ -From cc6cf04f59ec20757990b3e8586b7c3a7f497720 Mon Sep 17 00:00:00 2001 +From 782d5424188706c305cc9ebb838b341a9aba811f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cc6cf04f59ec20757990b3e8586b7c3a7f497720 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 9c88b9268e..2846ce0d3e 100644 +index c6cfb4c683..5b486dacfc 100644 @@ -23 +24 @@ -@@ -339,4 +339,21 @@ tap_rx_offload_get_queue_capa(void) +@@ -341,4 +341,21 @@ tap_rx_offload_get_queue_capa(void) @@ -45 +46 @@ -@@ -389,5 +406,5 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -391,5 +408,5 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -52 +53 @@ -@@ -1036,5 +1053,5 @@ tap_dev_close(struct rte_eth_dev *dev) +@@ -1023,5 +1040,5 @@ tap_dev_close(struct rte_eth_dev *dev) @@ -59 +60 @@ -@@ -1075,5 +1092,5 @@ tap_rx_queue_release(void *queue) +@@ -1062,5 +1079,5 @@ tap_rx_queue_release(void *queue) @@ -66 +67 @@ -@@ -1485,5 +1502,5 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, +@@ -1406,5 +1423,5 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,