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 94D13A0543 for ; Sat, 5 Nov 2022 18:13:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8CA1340151; Sat, 5 Nov 2022 18:13:00 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id B9593400D5 for ; Sat, 5 Nov 2022 18:12:59 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id z14so10888326wrn.7 for ; Sat, 05 Nov 2022 10:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LNOOKq8OAIC47ZiPs2t256Y3dVvUO8Qk1/9llAqwKWY=; b=Nf+q2Hi8+jBa9+vkoHdLptVHKexsgE6N0+W/uOJbUgUMe7ndVC3qx0OGMoxdBj42yT +GAIL6WvYScEIR80kNyxzAcu9SJAs+KlZFC6tCIQ0LmEcuYQ1UxOwRTI73M6Mc1F95vk UioC+DDR7ZbFc1FlAG5gknKGudUsm2phtliMT5sfGQ0astwJf3WPj+/9asT2MVXHiNzH zs9Mj2StQM1HzBnr90dH0FcftDreG7CkuTykjvGtdeqdNQude7BQj7nXjeWJX/rNuby+ T7JyY/2uMGaJfiIPKwKdcHF2P1wtmi4fvy2lAw6+6N0nvvu0w15m7I46uYC14zwVqevM kqmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LNOOKq8OAIC47ZiPs2t256Y3dVvUO8Qk1/9llAqwKWY=; b=hnTPV6Feo3sLIYah/vNI/jeDwV5GxXh9EzPcZG+8s1ji5vx9Tjxf7X98eh2DFuDCYA Oyb/AM8VvG2Utr/IT4nRc8dzpRB6NVen8PkL8PcSp9tPtpOuLkLAwaY57PAps9Tf1tJs xqVyA4pDUmx3dPnSHmC4uIXZ6K0Gf4l19Ioho9VPa9dDxxiiYG/UHAK0tBwMp0f/O2l5 H/J1C35yorjajdT5ThXvbls92UqhW8no8f/ejuOZ2OTYUQ330cnQZ7S0l6e62TYe7NmD 3AvR8Jw4WmYLEi9qotOqicVzQulDgXFLbmc2n0Zs2ReWL3m21NKCP+EOo/ldg4lwIKuC JkYQ== X-Gm-Message-State: ACrzQf1ogBP0BIOKrCmj1N1LeS4OtJQkRaKwuIqU2Y2x5TXDt5t6ruFE 6XnA9aFIK4zvKYMM+kQmxPo= X-Google-Smtp-Source: AMsMyM42HAKuMy3kXI9h8K2pgGaX9+K6teh5ZRYGK3RE6xUIy6kqa+Bda5177/SzPlcYNGiBAnHjAQ== X-Received: by 2002:a05:6000:786:b0:236:d441:8f5d with SMTP id bu6-20020a056000078600b00236d4418f5dmr19906872wrb.550.1667668379466; Sat, 05 Nov 2022 10:12:59 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id g8-20020a5d4888000000b0022e57e66824sm3037098wrq.99.2022.11.05.10.12.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:12:58 -0700 (PDT) From: luca.boccassi@gmail.com To: Ivan Malov Cc: Andrew Rybchenko , dpdk stable Subject: patch 'net/bonding: fix flow flush order on close' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:20 +0000 Message-Id: <20221105171146.1520039-21-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/07/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/a6f0c4fd618fa07befd885004f43cfc181ad92c7 Thanks. Luca Boccassi --- >From a6f0c4fd618fa07befd885004f43cfc181ad92c7 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Wed, 19 Oct 2022 14:18:05 +0300 Subject: [PATCH] net/bonding: fix flow flush order on close [ upstream commit df810d1b6e31a3e25085a6abae3be119af3034c1 ] The current code first removes all back-end devices of the bonded device and then invokes flush operation to remove flows in such back-end devices, which makes no sense. Fix that by re-ordering the steps accordingly. Fixes: 49dad9028e2a ("net/bonding: support flow API") Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko --- drivers/net/bonding/rte_eth_bond_pmd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index f426c66b69..d5dac1ef3e 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2140,6 +2140,10 @@ bond_ethdev_close(struct rte_eth_dev *dev) return 0; RTE_BOND_LOG(INFO, "Closing bonded device %s", dev->device->name); + + /* Flush flows in all back-end devices before removing them */ + bond_flow_ops.flush(dev, &ferror); + while (internals->slave_count != skipped) { uint16_t port_id = internals->slaves[skipped].port_id; @@ -2157,7 +2161,6 @@ bond_ethdev_close(struct rte_eth_dev *dev) skipped++; } } - bond_flow_ops.flush(dev, &ferror); bond_ethdev_free_queues(dev); rte_bitmap_reset(internals->vlan_filter_bmp); rte_bitmap_free(internals->vlan_filter_bmp); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:10.507316626 +0000 +++ 0021-net-bonding-fix-flow-flush-order-on-close.patch 2022-11-05 17:11:08.638941869 +0000 @@ -1 +1 @@ -From df810d1b6e31a3e25085a6abae3be119af3034c1 Mon Sep 17 00:00:00 2001 +From a6f0c4fd618fa07befd885004f43cfc181ad92c7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit df810d1b6e31a3e25085a6abae3be119af3034c1 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - drivers/net/bonding/rte_eth_bond_pmd.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + drivers/net/bonding/rte_eth_bond_pmd.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) @@ -21 +22 @@ -index 486b7fc9f7..51d543e5de 100644 +index f426c66b69..d5dac1ef3e 100644 @@ -24,3 +25,2 @@ -@@ -2156,6 +2156,9 @@ bond_ethdev_cfg_cleanup(struct rte_eth_dev *dev) - int skipped = 0; - struct rte_flow_error ferror; +@@ -2140,6 +2140,10 @@ bond_ethdev_close(struct rte_eth_dev *dev) + return 0; @@ -27,0 +28,2 @@ + RTE_BOND_LOG(INFO, "Closing bonded device %s", dev->device->name); ++ @@ -34 +36 @@ -@@ -2173,7 +2176,6 @@ bond_ethdev_cfg_cleanup(struct rte_eth_dev *dev) +@@ -2157,7 +2161,6 @@ bond_ethdev_close(struct rte_eth_dev *dev) @@ -39,3 +41,3 @@ - } - - int + bond_ethdev_free_queues(dev); + rte_bitmap_reset(internals->vlan_filter_bmp); + rte_bitmap_free(internals->vlan_filter_bmp);