From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6D700A0C47 for ; Tue, 10 Aug 2021 17:45:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 62EAA411C7; Tue, 10 Aug 2021 17:45:17 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 134F7411C6 for ; Tue, 10 Aug 2021 17:45:16 +0200 (CEST) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id EFE433F32C for ; Tue, 10 Aug 2021 15:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610315; bh=zEGImEUK8BH2dP7liBQUXg5doTUyK8SvJJ3epFYtSgE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SKx35qVyHpPRH7bF3uTS7cG/aswYAvN/b/t/HkfrahGm52S9XkhRkFEb29gvg+l24 q/uZ4vS9GtnwK99TqAjDHEkqMZEnVHZX9hFR60lIO8tGueNrwUIAF0qFT3FpjBdFse 4YxPJvQQqdyV9yo027vkUcaOKcgIfSSoVyd73i+9tEKACeaB+Mqaz9l5bbynUGMjdd jfRSULpb4XPgBi39R0w+2Kuv+wOJxpVxOsG3Hk8y9aYSXqQRw1eCO8bi7MM/Xzt/n1 N7gFawgzywWZZAm0C27winT/Mxs0/coLmEru+0wXfBz/xQ8rUoPwUov9CVWtNaFSWT y1aJEVW2W7D2g== Received: by mail-ej1-f72.google.com with SMTP id zp23-20020a17090684f7b02905a13980d522so5753762ejb.2 for ; Tue, 10 Aug 2021 08:45:15 -0700 (PDT) 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=zEGImEUK8BH2dP7liBQUXg5doTUyK8SvJJ3epFYtSgE=; b=CypWHRvPdeQzQosOokwRsCCPA9XamC0xYRCnhh2Z2LblmN1BUJmiPBCDenaKxeIW/A f+pfkuYk1x/OoziLZ9D67tuRmqkWi34ndCd/kJ9X3tqXyqFu4bQk5ooo0viChUWKV38u 9gdgrFgtGIqAbJ3IDLKULx8WdPMkfhag4uWJ4kREprqrBqn/nqac5n13P2e5QhqFLs21 nIezRdARXXZfULzdGdYoXsC7B6JhNP6B2UQVqZGJ6c5OOSM5MXgknq4S9QJL1NNr9j8u 5uFcmYbQsjfrizjWMdW2TL4pV9CoaNNDDPAJSHYhm3v3/VTHF1AWU8xoiLs9j2cHZK8C 6sdg== X-Gm-Message-State: AOAM533qK/HYXMGtRcLTyP1Omv6fsYXftRvaaC5+LXvrmdJcyf9jGP+3 dmxreEhKRJtaWkZYwP22/wUdCyU7qKDQYVvUeSHmjgfd+7ooyX0moooSYANlrBbmI3eBvEqsyFX 4RkY4rNd3EteSIZuMjnkNoGx5 X-Received: by 2002:a17:907:3e03:: with SMTP id hp3mr29186447ejc.183.1628610315445; Tue, 10 Aug 2021 08:45:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwAtAy9n0g3JSNxLani+xIRnHJCrDj/z8dyCBVgtgQxz7AoJIrfF0YZXGV/wCZBhwoJJsO7g== X-Received: by 2002:a17:907:3e03:: with SMTP id hp3mr29186435ejc.183.1628610315274; Tue, 10 Aug 2021 08:45:15 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id cb4sm7008642ejb.72.2021.08.10.08.45.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:45:14 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Xiaoyun Li Cc: Beilei Xing , dpdk stable Date: Tue, 10 Aug 2021 17:40:15 +0200 Message-Id: <20210810154022.749358-95-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix Tx threshold check' has been queued to stable release 19.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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.10 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/12/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/a4cb6c2543060ea443733548c24cb7462a174be0 Thanks. Christian Ehrhardt --- >From a4cb6c2543060ea443733548c24cb7462a174be0 Mon Sep 17 00:00:00 2001 From: Xiaoyun Li Date: Thu, 22 Jul 2021 15:56:20 +0800 Subject: [PATCH] net/iavf: fix Tx threshold check [ upstream commit ed21e06e44ad7fe5dfa4b8ed713e29833a474fa9 ] Function check_tx_thresh is called with wrong parameter. If the check fails, tx_queue_setup should return error not keep going. This patch fixes above issues. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Signed-off-by: Xiaoyun Li Acked-by: Beilei Xing --- drivers/net/iavf/iavf_rxtx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 93f3928af6..17468e4ca0 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -449,7 +449,8 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev, tx_conf->tx_rs_thresh : DEFAULT_TX_RS_THRESH); tx_free_thresh = (uint16_t)((tx_conf->tx_free_thresh) ? tx_conf->tx_free_thresh : DEFAULT_TX_FREE_THRESH); - check_tx_thresh(nb_desc, tx_rs_thresh, tx_rs_thresh); + if (check_tx_thresh(nb_desc, tx_rs_thresh, tx_free_thresh) != 0) + return -EINVAL; /* Free memory if needed. */ if (dev->data->tx_queues[queue_idx]) { -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:16.670207355 +0200 +++ 0095-net-iavf-fix-Tx-threshold-check.patch 2021-08-10 15:11:13.130638908 +0200 @@ -1 +1 @@ -From ed21e06e44ad7fe5dfa4b8ed713e29833a474fa9 Mon Sep 17 00:00:00 2001 +From a4cb6c2543060ea443733548c24cb7462a174be0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ed21e06e44ad7fe5dfa4b8ed713e29833a474fa9 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index d61b32fcee..e33fe4576b 100644 +index 93f3928af6..17468e4ca0 100644 @@ -23 +24 @@ -@@ -708,7 +708,8 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev, +@@ -449,7 +449,8 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,