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 8381FA0C47 for ; Tue, 10 Aug 2021 17:43:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D6004014F; Tue, 10 Aug 2021 17:43:44 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id EEDCC4114F for ; Tue, 10 Aug 2021 17:43:42 +0200 (CEST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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-1.canonical.com (Postfix) with ESMTPS id D7B834030A for ; Tue, 10 Aug 2021 15:43:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610222; bh=GxstPuH825l2lA9AdcDoJbnIsG2Oz/RTdvObOxoxvQM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hhrsGr/1Fl4ADAUSVA3tQ4ozzh5Am6Kf60XehTP2+4LevA/Y4OsCwns6nEAOseKuv vI1x+LgZKDmuggzyLphSFvC+5Rw8y8EIXuHo4EJ7gvfgYieLAIFaaVlSh5UAGB12hr sANCcdX/sDkaphLbqiIlUIW9wH7uyuILP1jPhewRFnarcUmwnKHfgqZZc7f12+RAKj QIzSfH70hr77uUnamhsiRy58dGiQsHV6MRbK8iCvT1iJhITjaWmh/XCg4WnYNtCE6N iAyoB8uVTPJ76741kcA7fDSRi/Ssoigqj/ilBIfQG6Sw//cei/dlIbUZH+isKd+3pk Vof8/BX9qlOCA== Received: by mail-ed1-f70.google.com with SMTP id u4-20020a50eac40000b02903bddc52675eso10764870edp.4 for ; Tue, 10 Aug 2021 08:43:42 -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=GxstPuH825l2lA9AdcDoJbnIsG2Oz/RTdvObOxoxvQM=; b=VArX0V7sw0uPWqHjm5m+/+1zNgLqbp51/w4xUR8XahcBT6uMvvQEW1UEAkSlqxDMcc zN+dZTk5UeVEQPvJZCj0eSKO/8njHFg3TSTfQMEdeeiakRb3wUK/TTcznJ2jWqctYtlt 8+MaRRv1NQpsgbNi8xtxt6a9nVydCL1+EKL6VskwxtupzFMPNe5sTnf0x+j+ctRUGABK VeiwIUfqib0JXzvYsFwS8jAfDwRuYbb/zXsm9OrTBE4zbrZMXDlkJlysDUoyX/7++dQR WcD1uClfOUc+wBWFUM90HewbcJpzp+kX/XamhQztkpiYNP4olqE4T5uCE7IYPoUOhGXI 72QQ== X-Gm-Message-State: AOAM533zq3F5M/AE1AEnRcHJqOdZHr0TVXwdhBKdJKrYcWzeI1OGbAlX 1cc+Ce/PncDHn82PSqE7z8HzKYMycZzGhLqsNgW1hYxB19opamQscWMKfoyV+KlfOreVHPTLP+U JSSZ1tEYYe10a2gGgrU+JK0wR X-Received: by 2002:a17:906:b351:: with SMTP id cd17mr29073951ejb.36.1628610222311; Tue, 10 Aug 2021 08:43:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykIT5UsQpuIoC6uVmppsBB9Pue8qvTiIZflDmX55YpWxXr/37woUjrSsvhe83UxWEvFO47/Q== X-Received: by 2002:a17:906:b351:: with SMTP id cd17mr29073937ejb.36.1628610222150; Tue, 10 Aug 2021 08:43:42 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id dh8sm9664476edb.14.2021.08.10.08.43.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:43:41 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Martin Havlik Cc: Min Hu , Andrew Rybchenko , dpdk stable Date: Tue, 10 Aug 2021 17:39:43 +0200 Message-Id: <20210810154022.749358-63-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/bonding: check flow setting' 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/e8b31f7fd71c09bf27998ca21e5e727640035458 Thanks. Christian Ehrhardt --- >From e8b31f7fd71c09bf27998ca21e5e727640035458 Mon Sep 17 00:00:00 2001 From: Martin Havlik Date: Tue, 22 Jun 2021 11:25:29 +0200 Subject: [PATCH] net/bonding: check flow setting [ upstream commit d844400966d0071680d618c21a896ec8c73a50e6 ] Return value from bond_ethdev_8023ad_flow_set() is now checked and appropriate message is logged on error. Fixes: 112891cd27e5 ("net/bonding: add dedicated HW queues for LACP control") Signed-off-by: Martin Havlik Acked-by: Min Hu (Connor) Reviewed-by: Andrew Rybchenko --- drivers/net/bonding/rte_eth_bond_pmd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 2ad36f42cf..7e4ed477a0 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1805,8 +1805,14 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, internals->mode4.dedicated_queues.flow[slave_eth_dev->data->port_id], &flow_error); - bond_ethdev_8023ad_flow_set(bonded_eth_dev, + errval = bond_ethdev_8023ad_flow_set(bonded_eth_dev, slave_eth_dev->data->port_id); + if (errval != 0) { + RTE_BOND_LOG(ERR, + "bond_ethdev_8023ad_flow_set: port=%d, err (%d)", + slave_eth_dev->data->port_id, errval); + return errval; + } } /* Start device */ -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:15.475781590 +0200 +++ 0063-net-bonding-check-flow-setting.patch 2021-08-10 15:11:13.062638416 +0200 @@ -1 +1 @@ -From d844400966d0071680d618c21a896ec8c73a50e6 Mon Sep 17 00:00:00 2001 +From e8b31f7fd71c09bf27998ca21e5e727640035458 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d844400966d0071680d618c21a896ec8c73a50e6 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 4c43bf9166..a6755661c4 100644 +index 2ad36f42cf..7e4ed477a0 100644 @@ -23 +24 @@ -@@ -1819,8 +1819,14 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, +@@ -1805,8 +1805,14 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,