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 06ED9427EF for ; Wed, 22 Mar 2023 11:32:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 021F5410EF; Wed, 22 Mar 2023 11:32:51 +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 141D5410DD for ; Wed, 22 Mar 2023 11:32:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679481168; 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=Hd1ncBdMlmo2BXztB8R3irMc2QZqZg/VoJ+idE8q7rY=; b=W/zBlKJoDWqm39As7COyL1Y7PnapSDxsmIlCTIz2Y8HueV3GMF64Z7xT5khU/3zolHRySN OKul3o0eYyxeogA+47VLnYjG7YjLy9+IPRPVWQf9d2Czz5WtjinEQYI/ohbkww39U1MTQf V/k3ZBPOTEezVyAhoTZWgItQI/+fnSE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-648-p31flRFbPmCBqyMwBmWGcg-1; Wed, 22 Mar 2023 06:32:43 -0400 X-MC-Unique: p31flRFbPmCBqyMwBmWGcg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CAA99101A550; Wed, 22 Mar 2023 10:32:42 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id C59E4492C13; Wed, 22 Mar 2023 10:32:41 +0000 (UTC) From: Kevin Traynor To: Zhichao Zeng Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix device stop during reset' has been queued to stable release 21.11.4 Date: Wed, 22 Mar 2023 10:32:04 +0000 Message-Id: <20230322103209.456098-17-ktraynor@redhat.com> In-Reply-To: <20230322103209.456098-1-ktraynor@redhat.com> References: <20230322103209.456098-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/24/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/35f911011c689d17c542d07a12a924dd0636207d Thanks. Kevin --- >From 35f911011c689d17c542d07a12a924dd0636207d Mon Sep 17 00:00:00 2001 From: Zhichao Zeng Date: Thu, 16 Mar 2023 15:14:49 +0800 Subject: [PATCH] net/iavf: fix device stop during reset [ upstream commit 24b8bc86dc489ab77d7de7626cc6af7ac9eaba0b ] The rte_eth_dev_stop will return wrong value as error will return from iavf PMD during device reset. This patch is a work around to fix it by return 0 in dev_stop during device reset. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Signed-off-by: Zhichao Zeng Acked-by: Qi Zhang --- drivers/net/iavf/iavf_ethdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 630779fb21..a115a9f641 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1035,4 +1035,7 @@ iavf_dev_stop(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); + if (vf->vf_reset) + return 0; + if (adapter->closed) return -1; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-22 10:30:08.349725571 +0000 +++ 0017-net-iavf-fix-device-stop-during-reset.patch 2023-03-22 10:30:07.930866582 +0000 @@ -1 +1 @@ -From 24b8bc86dc489ab77d7de7626cc6af7ac9eaba0b Mon Sep 17 00:00:00 2001 +From 35f911011c689d17c542d07a12a924dd0636207d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 24b8bc86dc489ab77d7de7626cc6af7ac9eaba0b ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 3196210f2c..f6d68403ce 100644 +index 630779fb21..a115a9f641 100644 @@ -25 +26 @@ -@@ -1066,4 +1066,7 @@ iavf_dev_stop(struct rte_eth_dev *dev) +@@ -1035,4 +1035,7 @@ iavf_dev_stop(struct rte_eth_dev *dev)