From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id C7F131B3B5 for ; Thu, 7 Feb 2019 14:28:33 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3522AC0860DC; Thu, 7 Feb 2019 13:28:33 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.33.36.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34AF019CB6; Thu, 7 Feb 2019 13:28:32 +0000 (UTC) From: Kevin Traynor To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Thu, 7 Feb 2019 13:26:00 +0000 Message-Id: <20190207132614.20538-54-ktraynor@redhat.com> In-Reply-To: <20190207132614.20538-1-ktraynor@redhat.com> References: <20190207132614.20538-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 07 Feb 2019 13:28:33 +0000 (UTC) Subject: [dpdk-stable] patch 'net/sfc: fix crash in EF10 TSO if no payload' has been queued to LTS release 18.11.1 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: , X-List-Received-Date: Thu, 07 Feb 2019 13:28:34 -0000 Hi, FYI, your patch has been queued to LTS release 18.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/14/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. Kevin Traynor --- >>From 35d082c20711099610d3c4d54957bf21dfe6c4aa Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Wed, 23 Jan 2019 13:08:55 +0000 Subject: [PATCH] net/sfc: fix crash in EF10 TSO if no payload [ upstream commit c2303617e664d5af3e5aac143d407f0474d5d7c0 ] Fixes: 6bc985e41155 ("net/sfc: support TSO in EF10 Tx datapath") Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ef10_tx.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/sfc/sfc_ef10_tx.c b/drivers/net/sfc/sfc_ef10_tx.c index bcd3153ff..ff6d5b486 100644 --- a/drivers/net/sfc/sfc_ef10_tx.c +++ b/drivers/net/sfc/sfc_ef10_tx.c @@ -382,4 +382,7 @@ sfc_ef10_xmit_tso_pkt(struct sfc_ef10_txq * const txq, struct rte_mbuf *m_seg, hdr_iova = rte_mbuf_data_iova(m_seg); if (rte_pktmbuf_data_len(m_seg) == header_len) { + /* Cannot send a packet that consists only of header */ + if (unlikely(m_seg->next == NULL)) + return EMSGSIZE; /* * Associate header mbuf with header descriptor @@ -410,4 +413,8 @@ sfc_ef10_xmit_tso_pkt(struct sfc_ef10_txq * const txq, struct rte_mbuf *m_seg, &m_seg, &in_off); + /* Cannot send a packet that consists only of header */ + if (unlikely(m_seg == NULL)) + return EMSGSIZE; + m_seg_to_free_up_to = m_seg; /* -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-02-07 13:19:56.832698592 +0000 +++ 0054-net-sfc-fix-crash-in-EF10-TSO-if-no-payload.patch 2019-02-07 13:19:55.000000000 +0000 @@ -1,10 +1,11 @@ -From c2303617e664d5af3e5aac143d407f0474d5d7c0 Mon Sep 17 00:00:00 2001 +From 35d082c20711099610d3c4d54957bf21dfe6c4aa Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Wed, 23 Jan 2019 13:08:55 +0000 Subject: [PATCH] net/sfc: fix crash in EF10 TSO if no payload +[ upstream commit c2303617e664d5af3e5aac143d407f0474d5d7c0 ] + Fixes: 6bc985e41155 ("net/sfc: support TSO in EF10 Tx datapath") -Cc: stable@dpdk.org Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko