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 41796428F8 for ; Sun, 9 Apr 2023 17:36:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 36F28427EE; Sun, 9 Apr 2023 17:36:00 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2069.outbound.protection.outlook.com [40.107.92.69]) by mails.dpdk.org (Postfix) with ESMTP id 199FF410EE for ; Sun, 9 Apr 2023 17:35:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k/tDa4ruPIm84CxENP5e1gm1PDyarAyXDdVB55e1B4ar9fRMSQ7BCpotfNZmwNHOcTsltbr3ujaTB7ZxWdGrYzPdQpxpi3xti2o2weMBzM4hYuOsAyHZR0RjWfaUXv+NWRJW3kFuYRF5YsmXkWWb7R68vqK7P9bdrHytVyTWV8mSs9z756UUgfS/EBpTEXDMn3XitRbk6Pzng4jK9bc37EnyUA+IQO4rRIGb5syC64awhdu9YFGHWF/wihnvj1trtC6dpqorqGVq2zXw0j2e9rnKBndflz7yJ5tlmeInZ32sqS981P+lFgyTnjMZazBDbCKv5KChUAi2ra8yBqPm1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bdCI5c/bTTIf5Tm76mYT328Mmg3x6QjbzrTf8zGr4Ic=; b=aSTXlbrYcwSUFpnsxEvzKE/iXpzmkBY/XLGA3J6gXOT/ThKMxqQ4/xy7pcnpw1z1YMOnUzgWfQZVYU9AnwC0kaokBs7cSIMAXajuryUVVoLK/R3EW2Wi2QahiBe8xLlbIPsABcIqDZpDnPiL1/kPWooOMAfRcdpNeeuZ7hdEeCZIfatDh30V3uvkOVJXJrF4J3zOzPwjM3dP3W/M9snzxfD3sFxWXNxHmJv+qBsZ/D6dKjOpAk+VFbKoVVnwQJlAau1kgnrZI+teI9HE9mv6nxHjETw3q8etLXjnaZY369GIqQzcoG1dN4cAlNJ26uNAWIgU2NTay0lH3gpECPFfMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bdCI5c/bTTIf5Tm76mYT328Mmg3x6QjbzrTf8zGr4Ic=; b=AX/MBpW2XzaCC8WGxJ/VjFDSvO4zWRRqEjTVKoPGmr7zQL8h/7q73uIfwSAJPOX+uxpMX7GLVrzdxiFm/4YiKnx3lB7cmlkPSSBtZyV1pXZ4uJTlWTYkGWyNy9kvxojrt2clEmy9yB20MxCTPZLZml8Zcil+bZ3QgMvfxbv2CT9X6I3jm+m9qwonJViamftAJlWFtMzPkXm2HcV2Axf6MGDKrWNXUkxW/xjhjs/N6xzmlhkpCuGWnrsqqIxLcBqASonuYBZoTRaRh1FfURkQNzBEk7M9hXKsRoS1sUwBzMEZbZ1I01eEPDmLw40humIFtTUnqT6KXfzSWiOrkE8MtA== Received: from BN9P223CA0001.NAMP223.PROD.OUTLOOK.COM (2603:10b6:408:10b::6) by CY8PR12MB8213.namprd12.prod.outlook.com (2603:10b6:930:71::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Sun, 9 Apr 2023 15:35:56 +0000 Received: from BN8NAM11FT036.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10b:cafe::e7) by BN9P223CA0001.outlook.office365.com (2603:10b6:408:10b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:35:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT036.mail.protection.outlook.com (10.13.177.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:35:55 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:35:39 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:35:38 -0700 From: Xueming Li To: Zhichao Zeng CC: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix device stop during reset' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:25:06 +0800 Message-ID: <20230409152529.5308-119-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT036:EE_|CY8PR12MB8213:EE_ X-MS-Office365-Filtering-Correlation-Id: eb46071c-6d02-421f-95cb-08db39101c66 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mH3rGa374oUwf5Qxd9rIOt6IbD41H/I+t6KfOht9hYnaVUyP2q5U9p1Eeok9j7LblhRvtiI4Ekw/GOyB3g1/kbWBowIpOdMpcvXx8l977g4CHgY1smcGQQ5LDH0UYd9fCbOVuGSZkjFjAwIn0FKdgYirUL8AAVh6yikLs14pljzq5d/uBgG/E+veGu+iw1bwHqx3UnLsZn5RvR9UoI/xDaB0kHXZCqlTv5OG5rsniA5iQmjrZOk2pLiszekcCnmnPO2I09ma8Df/4P+HDZqqfCXZtkBEDAbfoGSb/eOxiLKT4su/vED6qlydXN67uQlk41dPHFVYgxfudYx2x9L5KybKg16gCMSW3V5LcsxpWx6w8gE1n/ofDGG1Ar9h2FPUNWM/Cvc8guDVP5wN4QMuoXcoa7VajK4V/Lo7tY2UWH2LmDWg9s99w/BijYy9pj7pvOYK9Qq/08zTU5lr1DBXdfOHrZ+G0w8UvNS8d5j5L60QLHMR2/zLd1g8VYJJ++fZnsDlWPXc7bMPUKeu0tkXlHdw9njJtdq/+utjKuqoSJD4kXLjdMfW5tdXz1OqhtIZ1MPZ6hY0578w2gEos0FUmVE+qJpMf9wVi6Hj4peePc8P5Sm6gxbhufvxjbZUsG7na+1B7ecd7tCqTiAr7datYQbmkHlSO/6tM4OSJwcIxpVsy4JIYABCGqvouXqZ7Zy0xLovPdttOy8ex94Gkal1X6YY236cq8shSI1drYykvf8RckTLDSpEuN45fdswFMv/iEipkHxOU7NSgTsVWtBjOMwnF6ciYr265L+UA9p4zPNQQ3NWjf7iQzimo5/0wIXFqZV2C6rQ+FGH1QTyZrfkrg== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(39860400002)(396003)(136003)(376002)(451199021)(40470700004)(36840700001)(46966006)(86362001)(36756003)(316002)(41300700001)(8676002)(70206006)(4326008)(966005)(6916009)(7696005)(70586007)(54906003)(478600001)(40480700001)(55016003)(82310400005)(5660300002)(8936002)(2906002)(36860700001)(82740400003)(356005)(7636003)(16526019)(6286002)(186003)(6666004)(53546011)(1076003)(26005)(336012)(2616005)(426003)(47076005)(83380400001)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:35:55.9771 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb46071c-6d02-421f-95cb-08db39101c66 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT036.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8213 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 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/b836bb43cfaa8a12ecfac6e837d4c20817bf99fd Thanks. Xueming Li --- >From b836bb43cfaa8a12ecfac6e837d4c20817bf99fd 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 Cc: Xueming Li [ 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 3196210f2c..f6d68403ce 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1065,6 +1065,9 @@ iavf_dev_stop(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); + if (vf->vf_reset) + return 0; + if (adapter->closed) return -1; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:41.798564300 +0800 +++ 0118-net-iavf-fix-device-stop-during-reset.patch 2023-04-09 21:45:38.779042200 +0800 @@ -1 +1 @@ -From 24b8bc86dc489ab77d7de7626cc6af7ac9eaba0b Mon Sep 17 00:00:00 2001 +From b836bb43cfaa8a12ecfac6e837d4c20817bf99fd Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 24b8bc86dc489ab77d7de7626cc6af7ac9eaba0b ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org