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 37861A0553 for ; Mon, 17 Feb 2020 18:47:08 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 307DE1DA12; Mon, 17 Feb 2020 18:47:08 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 164BF1DA12 for ; Mon, 17 Feb 2020 18:47:07 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id w15so20798784wru.4 for ; Mon, 17 Feb 2020 09:47:07 -0800 (PST) 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=CwCXxd/sAk+n/qDfrkxWD7ekal5fTZRVAMoAhk1ovyI=; b=Hw5r4yy3q0qYTU18i3s7cWKtFzvurmYkLUH8PXh1pMQXaqc85ABz5Zk6dZ0AKqUxrt 9i8faeqtbd1IUH0v5hL/leETD3uVqLl0Qk7FzdlkG8ol6+Ba/LGJLyQgL/bq1xX0BnPa zSyJ2An1jm/0qgHYNEfdTbH9XIMby1FHEQ0xhWcMAmUf16pykOvQ5P+EgdUlnto6td5m hqKhJFY59CkQnCNeBZtRnr7DVGQHjkOlqsL8ZBSi/LPIp/c5Q5oWXa+tsSoLGlh25DIR zKWSigLMjQ/otxqB/fCDilQRV+WrK6+QKT6c7mBy6CUGLyOHtEpatPoZV5IcdxMiOkL5 VUrw== 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=CwCXxd/sAk+n/qDfrkxWD7ekal5fTZRVAMoAhk1ovyI=; b=qgN8rH52ORkDXlDqGM6TI/dF2vZ0w2nCRQFNXEkywYCTWEZAdafuTKJ21nuoYQsRLE l1DlrVUqQfzmOVoHEeTvGIX2RJTkVSg3E/SxU5chEFtqt95yWXNwB9C5TZjVtU0YNDaW oVIC+R041/rD2J4aVJbf6istupIEIoTYbQ2zlhYqJN7ANcOKJ+vsXBsyOYYCzwzOqTIx /M6pTrt9ouUcdKjaemEBLKmebrVKJHthbzTE0SquvZOwQFPulnw1IVkLmZaIUXOWa0fW 4NylEnGFsYVsw5cnsATfKx3DhF+bLmr4EuN85+zVzhE+AtbDYjPxGkZRsRU2ckN9r6s9 MdRw== X-Gm-Message-State: APjAAAX2hW6xhQzKf6yphFUotnK40ElFP5AgjQKpcDTUVRMhfkBwMaoc Rfggyc8N9Yweb/zkEJYdgjI= X-Google-Smtp-Source: APXvYqzmcrQFYeK7hrGkbhCTs6cvnn+ldIUxy6rV2IoA8y1ratcYBhybs7mF9V2K+KV+UmsUBtgTgA== X-Received: by 2002:a5d:5263:: with SMTP id l3mr22963360wrc.405.1581961626849; Mon, 17 Feb 2020 09:47:06 -0800 (PST) Received: from localhost (userh634.uk.uudial.com. [194.69.103.7]) by smtp.gmail.com with ESMTPSA id v15sm1956484wrf.7.2020.02.17.09.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 09:47:06 -0800 (PST) From: luca.boccassi@gmail.com To: Sunil Pai G Cc: Xiaolong Ye , dpdk stable Date: Mon, 17 Feb 2020 17:45:37 +0000 Message-Id: <20200217174546.25334-45-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200217174546.25334-1-luca.boccassi@gmail.com> References: <20200211112216.3929-190-luca.boccassi@gmail.com> <20200217174546.25334-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix unchecked Tx cleanup error' has been queued to stable release 19.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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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/19/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 6ecf6e42a2f142d6674c432d659f27e18e875ac6 Mon Sep 17 00:00:00 2001 From: Sunil Pai G Date: Wed, 12 Feb 2020 05:37:10 +0000 Subject: [PATCH] net/ice: fix unchecked Tx cleanup error [ upstream commit fe38133c42d846613a41beff49ab0e1b9a3e0e61 ] Coverity complains of unchecked return value warning of ice_xmit_cleanup, while this cleanup is opportunistic and will not cause problems if it fails. So instead of checking the return value of ice_xmit_cleanup and return in case of cleanup failure, we directly cast it to void function to make the Coverity happy. Coverity issue: 353623 Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx") Signed-off-by: Sunil Pai G Acked-by: Xiaolong Ye --- drivers/net/ice/ice_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index ccc2c93398..37e792b05b 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2471,7 +2471,7 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) /* Check if the descriptor ring needs to be cleaned. */ if (txq->nb_tx_free < txq->tx_free_thresh) - ice_xmit_cleanup(txq); + (void)ice_xmit_cleanup(txq); for (nb_tx = 0; nb_tx < nb_pkts; nb_tx++) { tx_pkt = *tx_pkts++; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-17 17:00:16.566414530 +0000 +++ 0045-net-ice-fix-unchecked-Tx-cleanup-error.patch 2020-02-17 17:00:15.371951362 +0000 @@ -1,8 +1,10 @@ -From fe38133c42d846613a41beff49ab0e1b9a3e0e61 Mon Sep 17 00:00:00 2001 +From 6ecf6e42a2f142d6674c432d659f27e18e875ac6 Mon Sep 17 00:00:00 2001 From: Sunil Pai G Date: Wed, 12 Feb 2020 05:37:10 +0000 Subject: [PATCH] net/ice: fix unchecked Tx cleanup error +[ upstream commit fe38133c42d846613a41beff49ab0e1b9a3e0e61 ] + Coverity complains of unchecked return value warning of ice_xmit_cleanup, while this cleanup is opportunistic and will not cause problems if it fails. So instead of checking the return value of @@ -11,7 +13,6 @@ Coverity issue: 353623 Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx") -Cc: stable@dpdk.org Signed-off-by: Sunil Pai G Acked-by: Xiaolong Ye @@ -20,7 +21,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c -index ce5b8e6ca3..60c411bfad 100644 +index ccc2c93398..37e792b05b 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2471,7 +2471,7 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)