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 45AFF42800 for ; Wed, 22 Mar 2023 01:42:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 41758427F2; Wed, 22 Mar 2023 01:42:34 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 052CF40F18 for ; Wed, 22 Mar 2023 01:42:33 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id i5-20020a05600c354500b003edd24054e0so5310503wmq.4 for ; Tue, 21 Mar 2023 17:42:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679445753; 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=ZZgTrATfwP3a5gUIyDlgM+kqhq/EA7M88orq7j7qF0E=; b=Acbz3C7wGj4VFQssEY2PS2YhhnA1mbpFYx68ccEgQjwy1Mqgys/D9MvuRzc7tNJcxG s/BlQNpkN6H8rGIKYvH3bCrDHADURHXOrU0QI4+Snib0hRckWYKGX2/COejS2IOh8Dt7 yeNDyp/i+cIjcFBZw/VdJLRYzwPVlGe59yzh2EViVQalnf1MfiAEO2AvBp1YbUBiMt1y x8+WMIFs3j6wGqAsHfWRRhfBir9QiOO3+QVUUSt9rL7WmoCxVl5wKsl12wzEIB4aER6C zayWh2WyQsTC35ffauHiLKhvkmTfGd1S/i5Unl43IiZooyFFbH9IoAZe+PpFkOfZQqxR rNrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679445753; 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=ZZgTrATfwP3a5gUIyDlgM+kqhq/EA7M88orq7j7qF0E=; b=rbeUsFi954vqhv7DWtFYXMpNkaEEm/zc9F2EoOoW7dwPSMzELWJswMmmIc3aGhTZia uOTDJfuV8BfdufS0rtIVNS36nkhgfpd7eHDTSMVBTS/6nOKdh7dE9HwO5brfEY/QcJVp giHAzubk4Hkwy8hS0pNKmVfdZVzGLvYEtTRwLu4pGisyqQ+T+BJj+IV5S/VglSvFqxM+ SFN2kCh8GH6umvvyxeU1PMYeqDSOcSmOI4F18L8i6QJDsUKZ0L3nZ96J6iXOi5Eh8bZw rsqFmyzDpVq1bC0MHW4QYZNIUGwh/M90I2MRA/KxotFnLzh1RT2XsJXoldzUv3EWgK7q 3cmg== X-Gm-Message-State: AO0yUKWbRf+Nh4JOQ+oEDep93FNa6RIt9WjUEYQqrqWGTDO/imtZCfFS XZcKGI0H9iJPdT3T2u7kexqkSfyG1qE= X-Google-Smtp-Source: AK7set/uI/jbIUyGOzW0bVDWhGtBofM4CmlcoXxQZj7imHHijXqoCKiq6/fzrOvQPPTm0D2liukyyg== X-Received: by 2002:a05:600c:5009:b0:3df:9858:c039 with SMTP id n9-20020a05600c500900b003df9858c039mr246901wmr.14.1679445752794; Tue, 21 Mar 2023 17:42:32 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id y13-20020a1c4b0d000000b003ed551b139csm15019799wma.36.2023.03.21.17.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 17:42:32 -0700 (PDT) From: luca.boccassi@gmail.com To: Zhichao Zeng Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix device stop during reset' has been queued to stable release 20.11.8 Date: Wed, 22 Mar 2023 00:41:50 +0000 Message-Id: <20230322004155.2333903-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322004155.2333903-1-luca.boccassi@gmail.com> References: <20230315224631.1025649-39-luca.boccassi@gmail.com> <20230322004155.2333903-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.8 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/23/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/6e5a51df8967cdc93c506e63be0714d5253d512e Thanks. Luca Boccassi --- >From 6e5a51df8967cdc93c506e63be0714d5253d512e 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 9387f17c81..0cb2a457a2 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -750,6 +750,9 @@ iavf_dev_stop(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); + if (vf->vf_reset) + return 0; + if (adapter->stopped == 1) return 0; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-21 21:56:37.616024480 +0000 +++ 0014-net-iavf-fix-device-stop-during-reset.patch 2023-03-21 21:56:37.080807217 +0000 @@ -1 +1 @@ -From 24b8bc86dc489ab77d7de7626cc6af7ac9eaba0b Mon Sep 17 00:00:00 2001 +From 6e5a51df8967cdc93c506e63be0714d5253d512e 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 9387f17c81..0cb2a457a2 100644 @@ -25 +26 @@ -@@ -1065,6 +1065,9 @@ iavf_dev_stop(struct rte_eth_dev *dev) +@@ -750,6 +750,9 @@ iavf_dev_stop(struct rte_eth_dev *dev) @@ -32,2 +33,2 @@ - if (adapter->closed) - return -1; + if (adapter->stopped == 1) + return 0;