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 B00A5A0351 for ; Thu, 6 Aug 2020 11:59:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A54771C1A0; Thu, 6 Aug 2020 11:59:51 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 6126337B4 for ; Thu, 6 Aug 2020 11:59:50 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id 184so9087336wmb.0 for ; Thu, 06 Aug 2020 02:59:50 -0700 (PDT) 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=rqzxHVZMMn5xUpHsXCjpsDnYdFCwZLohqCWK/MXBExQ=; b=V5xei4jkJAdkKcNoi13Fw2uJZDhnkCAN6UpZ7auq1Ehm3UVYGUbyFYUagnFb1c1YB3 YnUzfkWHYos6zPywUqQrW5qlfzTlp4RqfZx9wgMRHZXTkPiWcmIJD3iJ8ZOfL6hHrnir gTmkZQJm2EKR6OeR1T4EPBmTziTyqdzDJBD51/5dMNlydX4Wq6VcFZq9WsVpmpLopX0K BIC0cMvPT9VqBxbS4mxAms8YDRMhQwM+dmX7Yqagu7J4djsfORXuMGNKQYmBQpS6aVau +XXPthnHHMqMG7OjfoZFTbNJeWDPzOKSDvVTtMbg1rdRAaO6xyOsWsaxdH4rZYnYCqUb EJZQ== 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=rqzxHVZMMn5xUpHsXCjpsDnYdFCwZLohqCWK/MXBExQ=; b=cYqwsvE7qGTuCNO4qDo4IHJIUIV5VvFEJbx10xRQd71ivZ90/C5QgIE+vze8TxcPVV ttTLyUkbG7YHOZoRInYSMz5gZYTgYKYMM5QA+4Shw10nGO2rx6364ncm9apsUnOwaSy+ S5DtntM+Bj6pffAJeUVERBkFJV+5qKyCzNV4WqRiQZIMPhuknCWWrm26UF0jmPPCh0Gc 8iCsNLaaisYO3tx9wIt/lvTvu40r72o5OqqVNs+Nz7iDorb1iRJpfldfrc85hCJN+hMe AvJ/162cRKzJm4/L7H9gQBzBVGPmzG5Cn1HiTvJelko8zdl428ynLi+kIKQ+2uZCJlJX Ca5g== X-Gm-Message-State: AOAM53270jOhgQEWhZDA4wqrmwMg1csbkmz6BbYGIEg1y0r2n75Mgpub Dhju1ke+Lhx9pPRzZhPRMmc= X-Google-Smtp-Source: ABdhPJxJ0e2p6oSM2+h+p+Wn3E9Xjrlj5BZ6RSVqGjt8tDDlzfghuTvkOLWPXyGDJPlagGLymTRM4w== X-Received: by 2002:a1c:c90d:: with SMTP id f13mr7403781wmb.25.1596707990106; Thu, 06 Aug 2020 02:59:50 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f12sm5832508wmc.46.2020.08.06.02.59.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:59:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Haiyue Wang Cc: Qi Zhang , dpdk stable Date: Thu, 6 Aug 2020 10:54:10 +0100 Message-Id: <20200806095411.774624-42-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix Tx hang with TSO' has been queued to stable release 19.11.4 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 stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/08/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. Thanks. Luca Boccassi --- >From 9a3ce8a48c35adbf7046bac466b012bf719541ce Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Fri, 31 Jul 2020 12:27:13 +0800 Subject: [PATCH] net/ice: fix Tx hang with TSO [ upstream commit 8a72edd9cb232b868c38373e041b03db1220e779 ] The variables 'td_offset' and 'td_tag' should be reset to 0 for every burst packet, otherwise the fields of Tx Descriptor will be set wrong, this will cause the MDD event error, and Tx will hang. Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx") Signed-off-by: Haiyue Wang Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index eb27a66cd..3d8280bb3 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2458,6 +2458,8 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) tx_pkt = *tx_pkts++; td_cmd = 0; + td_tag = 0; + td_offset = 0; ol_flags = tx_pkt->ol_flags; tx_offload.l2_len = tx_pkt->l2_len; tx_offload.l3_len = tx_pkt->l3_len; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:17.406844946 +0100 +++ 0042-net-ice-fix-Tx-hang-with-TSO.patch 2020-08-06 10:53:15.840598193 +0100 @@ -1,14 +1,15 @@ -From 8a72edd9cb232b868c38373e041b03db1220e779 Mon Sep 17 00:00:00 2001 +From 9a3ce8a48c35adbf7046bac466b012bf719541ce Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Fri, 31 Jul 2020 12:27:13 +0800 Subject: [PATCH] net/ice: fix Tx hang with TSO +[ upstream commit 8a72edd9cb232b868c38373e041b03db1220e779 ] + The variables 'td_offset' and 'td_tag' should be reset to 0 for every burst packet, otherwise the fields of Tx Descriptor will be set wrong, this will cause the MDD event error, and Tx will hang. Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx") -Cc: stable@dpdk.org Signed-off-by: Haiyue Wang Acked-by: Qi Zhang @@ -17,10 +18,10 @@ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c -index bcb67ec25..b83c5c862 100644 +index eb27a66cd..3d8280bb3 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c -@@ -2431,6 +2431,8 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -2458,6 +2458,8 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) tx_pkt = *tx_pkts++; td_cmd = 0;