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 1806BA0350 for ; Mon, 21 Feb 2022 16:41:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 12B0E410F6; Mon, 21 Feb 2022 16:41:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 4EE954013F for ; Mon, 21 Feb 2022 16:41:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G5x/vNQ3Tc/5TEvNV0R7ERBstOSItSHtyPYA4bLvepA=; b=C7GvasiAHo9f6blQqFv0f/EgdD77dy0YWm/UBfXCGjTiVmeTs1C67a0m+cJ68lf7/crtww L+c7FhC60WNl2ijHHWaOAUHKwGfun4HUdHj41/htBpaNhjrqPLUglzFeIv317NxMp4i2ts MIv1T1XqYMhjdxvbLXTyxxj0s+GP5aY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-488-LmkAxSahPKyCe5r97XgDYQ-1; Mon, 21 Feb 2022 10:41:07 -0500 X-MC-Unique: LmkAxSahPKyCe5r97XgDYQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D3CD8144E0; Mon, 21 Feb 2022 15:41:06 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F8D47E2E8; Mon, 21 Feb 2022 15:41:05 +0000 (UTC) From: Kevin Traynor To: "Min Hu (Connor)" Cc: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix bonding mode set' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:27 +0000 Message-Id: <20220221153625.152324-138-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/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/605d1de0d3a4ca8d99d66c1cb6af831556ccc904 Thanks. Kevin --- >From 605d1de0d3a4ca8d99d66c1cb6af831556ccc904 Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Fri, 28 Jan 2022 10:35:19 +0800 Subject: [PATCH] app/testpmd: fix bonding mode set [ upstream commit 39ddd5d1895e72ba2bc974eddbc12a3135639ed1 ] when start testpmd, and type command like this, it will lead to Segmentation fault, like: testpmd> create bonded device 4 0 testpmd> add bonding slave 0 2 testpmd> add bonding slave 1 2 testpmd> port start 2 testpmd> set bonding mode 0 2 testpmd> quit Stopping port 0... Stopping ports... ... Bye... Segmentation fault The reason to the bug is that rte timer do not be cancelled when quit. That is, in 'bond_ethdev_start', resources are allocated according to different bonding mode. In 'bond_ethdev_stop', resources are free by the corresponding mode. For example, 'bond_ethdev_start' start bond_mode_8023ad_ext_periodic_cb timer for bonding mode 4. and 'bond_ethdev_stop' cancel the timer only when the current bonding mode is 4. If the bonding mode is changed, and directly quit the process, the timer will still on, and freed memory will be accessed, then segmentation fault. 'bonding mode' changed means resources changed, reallocate resources for different mode should be done, that is, device should be restarted. Fixes: 2950a769315e ("bond: testpmd support") Signed-off-by: Min Hu (Connor) Tested-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index e626b1c7d9..16ad4be005 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -5916,4 +5916,17 @@ static void cmd_set_bonding_mode_parsed(void *parsed_result, struct cmd_set_bonding_mode_result *res = parsed_result; portid_t port_id = res->port_id; + struct rte_port *port = &ports[port_id]; + + /* + * Bonding mode changed means resources of device changed, like whether + * started rte timer or not. Device should be restarted when resources + * of device changed. + */ + if (port->port_status != RTE_PORT_STOPPED) { + fprintf(stderr, + "\t Error: Can't set bonding mode when port %d is not stopped\n", + port_id); + return; + } /* Set the bonding mode for the relevant port. */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.581722491 +0000 +++ 0138-app-testpmd-fix-bonding-mode-set.patch 2022-02-21 15:22:44.290704574 +0000 @@ -1 +1 @@ -From 39ddd5d1895e72ba2bc974eddbc12a3135639ed1 Mon Sep 17 00:00:00 2001 +From 605d1de0d3a4ca8d99d66c1cb6af831556ccc904 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 39ddd5d1895e72ba2bc974eddbc12a3135639ed1 ] + @@ -36 +37,0 @@ -Cc: stable@dpdk.org