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 635E9431A0 for ; Thu, 19 Oct 2023 02:01:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B719E427D7; Thu, 19 Oct 2023 02:01:33 +0200 (CEST) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 72AD14029E for ; Thu, 19 Oct 2023 02:01:32 +0200 (CEST) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-406609df1a6so68138715e9.3 for ; Wed, 18 Oct 2023 17:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697673692; x=1698278492; darn=dpdk.org; 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=NZeiK44xpTR/EUHYQ6aCYCB/kpO8ZToyLlfC4VC0hEw=; b=dgeFKbOh4uC8HgrySQ6yt7yjwb0Tmt5VBVs3MbuUhqAD6pmuU7jD4JtilJfgBSnR7r Gzux8NqtHKkSK64myjoSwD0Xb0F1YLC+OVoRU0K+ODazu5wJubNLfptvlbQQEYg/Djpe CYJajowcuDkNvSoPxjktCR2hnmv5j/+F+zrRjtI+JcbKDeIRgbIQhibhMBLLbpuHRPHv QJxXQDmsuWgYV0XAL/VjzWcFXQv6YgmzmldNTOzgNGLASrRWbeax4Br9FQk3+gXyiQ2Q Y1iMEbG32m9QkMhpWOM0eA/kVMSaVAdhggUNflKVkW2fAppLyuj8RySCE+zuCm72AbEi Kbog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697673692; x=1698278492; 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=NZeiK44xpTR/EUHYQ6aCYCB/kpO8ZToyLlfC4VC0hEw=; b=l/jnMrFx6xgwmDWzfKFVa2w4a0JzIwh+s6lid6hpdMdZggBbM54QWwjjHZfHIlsPWi JRVSvA3MogXMQUvE+ydxKkeTJE6EH5pViba+wjSrQkvyL/FPz8ChFUDNe7npUvqsdx2t T+cLFeDXjQPmZh682ObgoQhktfxIRzwt+M+xnG2grvgAsJ+GsVYgr3kYAHftjRlVkaDw 1wMsQCJnpsSAbbDUnmZhfKbviZcD52fUHmKIBwPI0ZidqPmJiR57MhxIuW1gJKFUwa3e eHRADph8ReJbNHIHN4fyJLerjbcfcJmYAkeFd0Xs2DVIvSkzCZ8XB0EA3LmnPra7StWK CHgA== X-Gm-Message-State: AOJu0YzjN3pUksI7vxCnT41IV7kQ4nGigOrCcqJmuEczd6FsbjJAZ6gi +pH+ELeaY0ESOphjmSlnFniHzT9kaFHdNgXW X-Google-Smtp-Source: AGHT+IHAGVgbtnVFMjBurg7bc50ua6phb2/T+QMuOwoU3rqRnkHwpr+h51GWNrWmntg54Phk0zY2ow== X-Received: by 2002:a05:600c:1c08:b0:407:5ad0:ab5b with SMTP id j8-20020a05600c1c0800b004075ad0ab5bmr600764wms.8.1697673692112; Wed, 18 Oct 2023 17:01:32 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id i42-20020a05600c4b2a00b00406408dc788sm2875201wmp.44.2023.10.18.17.01.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 17:01:31 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Chengwen Feng , Ferruh Yigit , dpdk stable Subject: patch 'net/bonding: fix link status callback stop' has been queued to stable release 20.11.10 Date: Thu, 19 Oct 2023 00:59:29 +0100 Message-Id: <20231018235930.3144-40-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018235930.3144-1-luca.boccassi@gmail.com> References: <20231018235930.3144-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.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 10/21/23. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f709931ab05eb6ce1b98ce0820ff03460e900f48 Thanks. Luca Boccassi --- >From f709931ab05eb6ce1b98ce0820ff03460e900f48 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 16 Oct 2023 10:47:43 +0200 Subject: [PATCH] net/bonding: fix link status callback stop [ upstream commit 615bd385b93e89e062b4e134e9cc09a79289a0f6 ] If a bonding port gets released, a link status alarm callback still referenced the ethdev port that may be reused later. Cancel this callback when stopping the port. Bugzilla ID: 1301 Fixes: a45b288ef21a ("bond: support link status polling") Signed-off-by: David Marchand Acked-by: Chengwen Feng Acked-by: Ferruh Yigit --- drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 3dcdae72b6..0c9a1df000 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2114,6 +2114,10 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev) eth_dev->data->dev_link.link_status = ETH_LINK_DOWN; eth_dev->data->dev_started = 0; + if (internals->link_status_polling_enabled) { + rte_eal_alarm_cancel(bond_ethdev_slave_link_status_change_monitor, + (void *)&rte_eth_devices[internals->port_id]); + } internals->link_status_polling_enabled = 0; for (i = 0; i < internals->slave_count; i++) { uint16_t slave_id = internals->slaves[i].port_id; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-19 00:28:58.246966078 +0100 +++ 0040-net-bonding-fix-link-status-callback-stop.patch 2023-10-19 00:28:56.309806953 +0100 @@ -1 +1 @@ -From 615bd385b93e89e062b4e134e9cc09a79289a0f6 Mon Sep 17 00:00:00 2001 +From f709931ab05eb6ce1b98ce0820ff03460e900f48 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 615bd385b93e89e062b4e134e9cc09a79289a0f6 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index aa7c911f19..c40d18d128 100644 +index 3dcdae72b6..0c9a1df000 100644 @@ -25,2 +26,2 @@ -@@ -2164,6 +2164,10 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev) - eth_dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN; +@@ -2114,6 +2114,10 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev) + eth_dev->data->dev_link.link_status = ETH_LINK_DOWN; @@ -30 +31 @@ -+ rte_eal_alarm_cancel(bond_ethdev_member_link_status_change_monitor, ++ rte_eal_alarm_cancel(bond_ethdev_slave_link_status_change_monitor, @@ -34,2 +35,2 @@ - for (i = 0; i < internals->member_count; i++) { - uint16_t member_id = internals->members[i].port_id; + for (i = 0; i < internals->slave_count; i++) { + uint16_t slave_id = internals->slaves[i].port_id;