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 92900A04A3 for ; Fri, 5 Jun 2020 20:27:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 86FC01D510; Fri, 5 Jun 2020 20:27:35 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id C1A0F1D510 for ; Fri, 5 Jun 2020 20:27:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381651; 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=uAqQVmrrbIPvBW4DCsw2cvyVKH/EfBHbw39Lb6+vzQA=; b=dm/A9VB9PYOSRnz0T4cEm6KwWIwfZaXrt2X6gEoAiN/dLxXmtQ6UnaEBbLSYGCw4heJVBN 8FFTrcyvZWhsHB6IigefDv+4mvJpULMwKY4BJvbmilzfnTrHS8PWDj6N3RCSmkfO6b0fyO HElcM4FKxjzQG4szG+KkQvEijIN9Fnw= 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-193-rHWqXUfVMmOOa3pAbCRy4Q-1; Fri, 05 Jun 2020 14:27:27 -0400 X-MC-Unique: rHWqXUfVMmOOa3pAbCRy4Q-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 7B3CD107ACCD; Fri, 5 Jun 2020 18:27:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F68660C47; Fri, 5 Jun 2020 18:27:25 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Yong Wang , dpdk stable Date: Fri, 5 Jun 2020 19:24:56 +0100 Message-Id: <20200605182525.22483-59-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-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/vmxnet3: handle bad host framing' 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/10/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/e44d378ab80ef9c9174ad0fba8294b37b970c042 Thanks. Kevin. --- >From e44d378ab80ef9c9174ad0fba8294b37b970c042 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 12 May 2020 13:40:03 -0700 Subject: [PATCH] net/vmxnet3: handle bad host framing [ upstream commit eb49f1671f30ede5121373e633c529b75993a6b2 ] The VMXNet3 protocol has a start-of-packet (SOP) and end-of-packet (EOP) marker. If there was a bug where mbuf arrived without SOP the code that chains the mbuf would dereference a null pointer. Also, record any mbuf's dropped in statistics. Although did the initial code no longer have access to VMware. Compile tested only! Coverity issue: 124563 Fixes: 8ee787ce80a8 ("vmxnet3: remove asserts that confuse coverity") Signed-off-by: Stephen Hemminger Acked-by: Yong Wang --- drivers/net/vmxnet3/vmxnet3_rxtx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index 6efa3ac217..f15fb6368e 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -948,5 +948,5 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) RTE_ASSERT(rxd->btype == VMXNET3_RXD_BTYPE_BODY); - if (rxm->data_len) { + if (likely(start && rxm->data_len > 0)) { start->pkt_len += rxm->data_len; start->nb_segs++; @@ -955,4 +955,8 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxq->last_seg = rxm; } else { + PMD_RX_LOG(ERR, "Error received empty or out of order frame."); + rxq->stats.drop_total++; + rxq->stats.drop_err++; + rte_pktmbuf_free_seg(rxm); } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:54.045499057 +0100 +++ 0059-net-vmxnet3-handle-bad-host-framing.patch 2020-06-05 19:20:50.881039200 +0100 @@ -1 +1 @@ -From eb49f1671f30ede5121373e633c529b75993a6b2 Mon Sep 17 00:00:00 2001 +From e44d378ab80ef9c9174ad0fba8294b37b970c042 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit eb49f1671f30ede5121373e633c529b75993a6b2 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index dd99684bee..73e270f30f 100644 +index 6efa3ac217..f15fb6368e 100644 @@ -28 +29 @@ -@@ -951,5 +951,5 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) +@@ -948,5 +948,5 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) @@ -35 +36 @@ -@@ -958,4 +958,8 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) +@@ -955,4 +955,8 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)