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 6D17EA034F for ; Wed, 10 Nov 2021 07:43:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 635CA4068B; Wed, 10 Nov 2021 07:43:11 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2048.outbound.protection.outlook.com [40.107.100.48]) by mails.dpdk.org (Postfix) with ESMTP id B83F14068B for ; Wed, 10 Nov 2021 07:43:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D5CBkXFZTNlKEKDfdO3nD9md0M3wl/EWGj2G+S5Qo+Gv39YGDO6CBTm39UQddRJgyHmumhZzkyO6p0KYx03RTTtoRixom+3U3adCMydvWIN6mg7ZN/M47q0kIJu13BVuOoG6hSZyxB0VrZuAmnAtR4zkTByGAZOwWxZODEFI4888F8LEsRyeCr2n1ZFtajpKfrL1oynLRbWMwjOYP6mE+4BInaT3fdzIthaeVtN28xHz4KOqsKktAKlHDo9yUfj8CcXlZ0Io4URbX2yKZdLABugTW9FTHBzWx9L7cGGxBqR/jReJ+IsaQJv6RUlaN+0g3LPpQ0Eb1S99y0hiGqyLHg== 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=jBKAmt0vcX3HtJPASLbLqM9B2QuEKl9AEobCxs31znw=; b=bFcRE2vxA80ZiMZrsX3skItU2+6bs6RBj0Gw88Bbvu298KFTN6s2KyGtMsmUnmg+7tEunbcDrpwb8f2yksa8/cvklklOgoWrELE7K9LZdYznDrpmoD20YfsDkMOB4FVc8phsHv84PRndW+yAoZ9FuqngP2/ED9Rk5/pruzXhQsg9WHus4J2TQB0vzuPTNxo0dIV6DXXaDoH1FF8CuhqmeUnaM1aQKr/oqom9HzIn5CmlkKqSfDQ1WMHGu2C7siBgZmgQnxcsigZNWHncODIVHoDirdKBkYChb+5JlR9Nq4OwA1WZUKvuXqLNfSERmaeMP8CJo7FuXWVvn9CKo4Ekbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=jBKAmt0vcX3HtJPASLbLqM9B2QuEKl9AEobCxs31znw=; b=K1szQN8BiIQ28LyWvBIjv35kjjTkXtV2LckNBHaNuErjuVILCu9dgtm8SvXphvWt298V5yL4PFi7e16M8VOYcDQOKPtu3qepBzg8lLqqfwwrFFaHOh+58HSRo8O+rTaeF5NUXsyTEuTgizo6OPvH5+ysnKtmq4hfP6VUuvdcB6vUjU72qMRRaZ48lQya8XxXpx6Mb27BGa8MNUL0RagvlDMqBaplpsHdZliOI2ZQVWh8+id9L536Sr7v1Ucaf3z0EtsDUE4uPMZbZi5b3v0rwqlbxQvIUJUOvFZri0XPEhzGsoBRFSRUMG2RA/cxIR7Qe2FdSg8Q2wpXg75BN2xTnw== Received: from DM5PR07CA0088.namprd07.prod.outlook.com (2603:10b6:4:ae::17) by BY5PR12MB4903.namprd12.prod.outlook.com (2603:10b6:a03:1d6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:43:07 +0000 Received: from DM6NAM11FT017.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::ad) by DM5PR07CA0088.outlook.office365.com (2603:10b6:4:ae::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:43:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT017.mail.protection.outlook.com (10.13.172.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:43:07 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:43:03 +0000 From: Xueming Li To: Dapeng Yu CC: Luca Boccassi , Haiyue Wang , dpdk stable Date: Wed, 10 Nov 2021 14:29:40 +0800 Message-ID: <20211110063216.2744012-97-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e8728b49-28b0-49bb-d804-08d9a4155acc X-MS-TrafficTypeDiagnostic: BY5PR12MB4903: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bABbzEOU6uoluCyOKQW1yHnwKg3Zrzx8fPfwLrUZg4QONLmtLggCjMkh0Wk3F869IQ39If29J7etiOAwFVf2A4wjxWGZgI6rjxDnrDefImX9q0A3QXZc2Zr5TEvtgphl6xIqIJhCbU4uVlJVj32MyesAf92bfcryDYcXnz0aWPUBTHNLcxTcnBvEoXdOZUZmWAKlT7IjnJazh+eZew/cfZJWQBnMODdBZN8uWj2Ge49PmHOlG31HcYUMfMU2/7tamjeDNYehDkqRd9kQdY1MQKzG9lYHCkFv4W9mxkgi0dTjMNJdaqh7XPTGL5b+vPrvo2C4nwiHsh5YAFzA3IvlzKpjtSWAOxYeqTPOb8hS1cf06zmzFcFfY0w0r9cDyoIl/vVBb9Hd4iUcsWWyTIWhBCI/ZSsYYJULJmFaesMfDxrUAIteyFougXIE/nhQ9ZZvr/3Q6Pzniwp0rfvgBMllFL3+K8rlSwcRqWCH6vKLSt2I5736VbAQUvZkEPX+Qb7Qd6pG5Do3f2cqpEo7Wf5VYsi7vfGGz0dXIFxReBf/cTHz2zacxEFrvc8CVs47OHZfUNHhZUkUNMTT/uHWU3XKw5xRFad/YW7iG6SfOTQJmaj7KH6KWcJjKVaQ96ODME9P4BDtf3ASnFuNBLOjJhDUt16cJA8HezCWwuTZyHiHsoCiZN4hS8frjBRHLAqeUvJkQP6J6G/fkzxpEA4az4+Ye+PLDdx9ET5ciAUhyr0v0bt2bmYC+kxyoP/LFup6DAy06UU+dreKCqxs+91KbxtKLduhVzo6SRvyHvCUhgnevcCCn3n/MafkE5SGb6zPi12TH53FU1vNcTUvA95zE9ATYw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(6286002)(508600001)(8676002)(8936002)(26005)(4326008)(6916009)(5660300002)(36860700001)(36756003)(82310400003)(70206006)(55016002)(6666004)(1076003)(47076005)(7696005)(54906003)(70586007)(16526019)(966005)(186003)(2616005)(426003)(4001150100001)(316002)(86362001)(83380400001)(53546011)(336012)(7636003)(356005)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:43:07.3069 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e8728b49-28b0-49bb-d804-08d9a4155acc X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT017.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4903 Subject: [dpdk-stable] patch 'net/ice: retry getting VF VSI map after failure' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 11/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/c9eddf61f5d527436bb08c406bc7a29cddd00b25 Thanks. Xueming Li --- >From c9eddf61f5d527436bb08c406bc7a29cddd00b25 Mon Sep 17 00:00:00 2001 From: Dapeng Yu Date: Fri, 24 Sep 2021 16:08:20 +0800 Subject: [PATCH] net/ice: retry getting VF VSI map after failure Cc: Xueming Li [ upstream commit b71573ec2fc239e814a3f329a7c88f4067e91eae ] The request of getting VF VSI map request may fail when DCF is busy, this patch adds retry mechanism to make it able to succeed. Fixes: b09d34ac8584 ("net/ice: fix flow redirector") Signed-off-by: Dapeng Yu Acked-by: Haiyue Wang --- drivers/net/ice/ice_dcf.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c index 6a24f4f36c..e371b3dc67 100644 --- a/drivers/net/ice/ice_dcf.c +++ b/drivers/net/ice/ice_dcf.c @@ -529,15 +529,26 @@ int ice_dcf_handle_vsi_update_event(struct ice_dcf_hw *hw) { struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(hw->eth_dev); - int err = 0; + int i = 0; + int err = -1; rte_spinlock_lock(&hw->vc_cmd_send_lock); rte_intr_disable(&pci_dev->intr_handle); ice_dcf_disable_irq0(hw); - if (ice_dcf_get_vf_resource(hw) || ice_dcf_get_vf_vsi_map(hw) < 0) - err = -1; + for (;;) { + if (ice_dcf_get_vf_resource(hw) == 0 && + ice_dcf_get_vf_vsi_map(hw) >= 0) { + err = 0; + break; + } + + if (++i >= ICE_DCF_ARQ_MAX_RETRIES) + break; + + rte_delay_ms(ICE_DCF_ARQ_CHECK_TIME); + } rte_intr_enable(&pci_dev->intr_handle); ice_dcf_enable_irq0(hw); -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:06.285199445 +0800 +++ 0096-net-ice-retry-getting-VF-VSI-map-after-failure.patch 2021-11-10 14:17:01.850746254 +0800 @@ -1 +1 @@ -From b71573ec2fc239e814a3f329a7c88f4067e91eae Mon Sep 17 00:00:00 2001 +From c9eddf61f5d527436bb08c406bc7a29cddd00b25 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b71573ec2fc239e814a3f329a7c88f4067e91eae ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 38e9a84698..c9c01a14e3 100644 +index 6a24f4f36c..e371b3dc67 100644 @@ -22 +24 @@ -@@ -534,15 +534,26 @@ int +@@ -529,15 +529,26 @@ int