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 87EA7A00C2 for ; Thu, 3 Nov 2022 10:28:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8405340694; Thu, 3 Nov 2022 10:28:13 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id CFB8240693 for ; Thu, 3 Nov 2022 10:28:11 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id t4so680903wmj.5 for ; Thu, 03 Nov 2022 02:28:11 -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=Snq7NCK00eSan+MmFdTq9gfIwP+tSUI0QjiS/YgVMkg=; b=eyCBjLu2WLZDRPoOT4VXPgGM6RY+e5N3hIG+PH8auJOUw9wiTWZOQSv4raBpJRypyr 8XA4G2jqmCqQPzDSDCH39FgDDeSxz6H10kG6PzUQEmveWEQ3N6H11p1yLzDZY+uVVxSd rPjJ9jOI667eIpoS9xRU2JWDCDfGza6BzemHbdmsVwon1iIzaLOONnxJPlZ/2pppIiP7 n3xWiGet4fHs1Hozpp4Oh/7AK29UA7nuNr59w+oWdUGHc5UYoz8xCPTV5VtfftC3Xrgz e8mL+82vrDBm5bKCAT3rZgg9d+++zA1Y92fFIU/mQi/fxb53PBdvo6gUDZq7ym2iG3e9 ho7w== 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=Snq7NCK00eSan+MmFdTq9gfIwP+tSUI0QjiS/YgVMkg=; b=o3yicMDoyTbHjDuxdB7XMZezKdpBcvjEB1X9HNmCWPVu/fAh2vfL97VeQwmByvU5kK 5j7ejXo2Qmz6+rMpxNAat2/H77BkDI1QvCU8jo1VDUvtQIOMaVJazaJkm4ED7LsWjGII Fj0VzANPlrzYZREETRhae6pPZ0ypEFJn2/B6oqiSDJ9s0IFeLcyxI7eoa3K4jJsxQK2t EC1sILHTRA4mojjMZYcf5xBt/nB0ksgZcbXrBlbnhALUBJCgm3hArTc303kq0Ctbz+TG 0Rny0qXp0KBq2NpUHw+tf1zP/NR3VEmMQYWiYsvk+SlnbwYnc2YlMyh188gfKQQQ16kW 3mGA== X-Gm-Message-State: ACrzQf1YZSMs0+sqpfL4oaFagk83q7z2GG342GBcvSoK+Bl9DVovH3h2 uDG5RmrO5KrJ+4UahKP05MM7CcdETFHGnA== X-Google-Smtp-Source: AMsMyM5432C/8to0BIxp9UAkrz/AfIfGSQcVeOltwaSGFiXx01mb4cBWf8x1ic+ZHnLBtZJ/d0Ax9g== X-Received: by 2002:a05:600c:5d3:b0:3cf:6bbf:9ee3 with SMTP id p19-20020a05600c05d300b003cf6bbf9ee3mr14914785wmd.15.1667467691473; Thu, 03 Nov 2022 02:28:11 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id t27-20020adfa2db000000b0023660f6cecfsm312586wra.80.2022.11.03.02.28.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:28:10 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Min Hu , dpdk stable Subject: patch 'net/bonding: fix double slave link status query' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:26:23 +0000 Message-Id: <20221103092758.1099402-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-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/05/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/df323985481d536778db3fe2f025456f5dbc7671 Thanks. Luca Boccassi --- >From df323985481d536778db3fe2f025456f5dbc7671 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Wed, 13 Jul 2022 19:11:13 +0800 Subject: [PATCH] net/bonding: fix double slave link status query [ upstream commit ac95744076a72c0a150a988cc9042a5422e5041f ] When link status polling mode is used, the slave link status is queried twice, which may be inconsistent. To fix this, we can keep the latest queried link state. Fixes: a45b288ef21a ("bond: support link status polling") Signed-off-by: Yunjian Wang Acked-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_pmd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 01ea83d988..f1c9a4299e 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2397,9 +2397,6 @@ bond_ethdev_slave_link_status_change_monitor(void *cb_arg) * event callback */ if (slave_ethdev->data->dev_link.link_status != internals->slaves[i].last_link_status) { - internals->slaves[i].last_link_status = - slave_ethdev->data->dev_link.link_status; - bond_ethdev_lsc_event_callback(internals->slaves[i].port_id, RTE_ETH_EVENT_INTR_LSC, &bonded_ethdev->data->port_id, @@ -2898,7 +2895,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, uint8_t lsc_flag = 0; int valid_slave = 0; - uint16_t active_pos; + uint16_t active_pos, slave_idx; uint16_t i; if (type != RTE_ETH_EVENT_INTR_LSC || param == NULL) @@ -2919,6 +2916,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, for (i = 0; i < internals->slave_count; i++) { if (internals->slaves[i].port_id == port_id) { valid_slave = 1; + slave_idx = i; break; } } @@ -3007,6 +3005,7 @@ link_update: * slaves */ bond_ethdev_link_update(bonded_eth_dev, 0); + internals->slaves[slave_idx].last_link_status = link.link_status; if (lsc_flag) { /* Cancel any possible outstanding interrupts if delays are enabled */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:25.834205514 +0000 +++ 0005-net-bonding-fix-double-slave-link-status-query.patch 2022-11-03 09:27:25.305421124 +0000 @@ -1 +1 @@ -From ac95744076a72c0a150a988cc9042a5422e5041f Mon Sep 17 00:00:00 2001 +From df323985481d536778db3fe2f025456f5dbc7671 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ac95744076a72c0a150a988cc9042a5422e5041f ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 02c96f697d..fd2d95a751 100644 +index 01ea83d988..f1c9a4299e 100644 @@ -23 +24 @@ -@@ -2418,9 +2418,6 @@ bond_ethdev_slave_link_status_change_monitor(void *cb_arg) +@@ -2397,9 +2397,6 @@ bond_ethdev_slave_link_status_change_monitor(void *cb_arg) @@ -33 +34 @@ -@@ -2919,7 +2916,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, +@@ -2898,7 +2895,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, @@ -42 +43 @@ -@@ -2940,6 +2937,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, +@@ -2919,6 +2916,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, @@ -50 +51 @@ -@@ -3028,6 +3026,7 @@ link_update: +@@ -3007,6 +3005,7 @@ link_update: