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 E5157433D8 for ; Mon, 11 Dec 2023 11:17:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E03B842D66; Mon, 11 Dec 2023 11:17:30 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2050.outbound.protection.outlook.com [40.107.237.50]) by mails.dpdk.org (Postfix) with ESMTP id 2389B40E0F for ; Mon, 11 Dec 2023 11:17:30 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HVfA4HQk0xNxIi/WhmKrCxm6JYra1gAFuj83chQOVPjPIEGaPEG+hKhEHTRWAdH96UeVAjqt/R6XXNdVE/X4ShripmKHXxY1C7MHQBstzkGQncm0DtjC8uzAX079VWebo9H/N4lIilYKHIHp8EtddJryzHF5014cH5boBse7xvFwXinAf/zfVRQu0vt4nDUkRvttTLfourMRDxHcPtqSAsooIK7k82Hu0tJNIYA646V8KGZ5UYls7kM2/3neMR51OSOYpKg1RXjFQjiS+rm8LuUbNPan1rJO5l2N2AUVs9ZO+3xrERtrFXdqmcHclFtImb4NnBjS6HfecOLgP7NieA== 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=K1jQLJ8LT4Mw08TUrns5I8wg7DeRszj8nKGqaXoPqBs=; b=SCcXPt+j4YTrKZBcvZ6sGuPuzb5gvqvZpqvPo2IQp3wQL9WRbTb19GCEnBHXfr7i0GaTn6XcpyPZ+ICS6FSXums20p/UepOeMh29LwQA8fEsjw1HtTVhcWolcyTH1rl47Q8mSjSn7Po6yJukpDfq3P4Zq0pQ3tKwrqkecoUU9SL9YdXBAEJfa2nquj1VeeRKj1urULZalp3za9lDlBk/BV3fxoojNAv8dVgs3aTazhC3n4AiOB9+bPwUiT028u6ZqUrQ+18nq1BKRJCvgTlpZ/zVW5lJeVAVjWRagj/EaUbGYrxwz1F+fy9mYhqXjhWaOOG+2oUpfm03VRSGl+3LGA== 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 (0) 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=K1jQLJ8LT4Mw08TUrns5I8wg7DeRszj8nKGqaXoPqBs=; b=lNAz4rPoERl+YYsOhLs+GCN9hczvuYxfr/7gPdEJuwKXiWNtRIeeL6I8blwM/RXl3mhu8x1/HeuYVbd1LMulojD7wvo5r29iz8ACixmMLZfg9KR9SnSnrBVJ+CyfjBWmiGmjS9X0fDa9i444ErNyaY0KoIOrLiyZ3JO0F7nNlofwGwv7WD/qx4fse6W7+0dJ3RCcsbZq7MUUQGMJR+EeFMvv+qACrTsJ5j018erAX6qfjOUhb1vXlnG7iBDsSZlIRS+MA6ZHTde+KqJgijUa/bO73HmTJgK6lJ54gZkFB6d0fKOK/dJDR1OFbVU8Y2wRHwPmWRhHTNMSgWd7fXNVWQ== Received: from DS7PR03CA0038.namprd03.prod.outlook.com (2603:10b6:5:3b5::13) by PH7PR12MB8426.namprd12.prod.outlook.com (2603:10b6:510:241::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:17:28 +0000 Received: from DS3PEPF000099DE.namprd04.prod.outlook.com (2603:10b6:5:3b5:cafe::cf) by DS7PR03CA0038.outlook.office365.com (2603:10b6:5:3b5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:17:27 +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 DS3PEPF000099DE.mail.protection.outlook.com (10.167.17.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:17:27 +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.41; Mon, 11 Dec 2023 02:17:14 -0800 Received: from nvidia.com (10.126.231.35) 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.41; Mon, 11 Dec 2023 02:17:12 -0800 From: Xueming Li To: Timothy Miskell CC: Jonathan Tsai , Qi Zhang , dpdk stable Subject: patch 'net/ice: fix L1 check interval' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:19 +0800 Message-ID: <20231211101226.2122-55-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099DE:EE_|PH7PR12MB8426:EE_ X-MS-Office365-Filtering-Correlation-Id: 6147f0b3-cc76-4879-c5c3-08dbfa3260a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w//sRztfXGboJBw0xJN93+0MtdTyqMFzKcXtxgbEFY4iEnRTeUVWXfjvp+fxoqJVBQbikwUIqSOIF7thlbBf3/ZkS4V2cKF3unEivlAieZxT/Tf0xXoh8EcTr5V4qn42wRRcmCsLoDkso0HR1oh7IsLLBO1/2ne45hySQysYxgpUN/9mtYO1+G7kXIUX6AuEl2z0Y+mCdqYv2rooS+V7wz2X6byaMriIt0wY615aYK04BGcNKcjgzpCM12z8ZHqPI/YuDv8QRMDVImIAjt1AAPcuPKfMY0F1laWCkN6LwTGzh40klfmhRmOvAuKMN6eqct+AZCk5SeWyMi7EMxbKTQtbfCeTFG9sHvhTaW8pRsWx+0qM25m0NafT44xUY+bkp3jvYJ5aU9+YUoP7OSX+G1lkHft5xzzgAaxsnNhActRZpTVKC454DS9D9DngGC0k/8AY1uwPkZ+iwO0xq7e0PpV3k/hqQBup6/4d5L+Dekcw1Hc04iIlwJjfqjYEciULLQFfP/BVrodsK8pw765i99Z5gcX1vbCyb6yPhTj9D69TpAr/aQjWMTvBIn5s3yl3Ee+Rgr+BVcypt0yztOEalJDZWoh8TVkXjPIj3+5s44pwPA93q+5ZehLaQSEZHA0H4c6btNaDF7YrxSXJ/GY2Bl6JJJmmbIIz2ZS5LNYSx74CSgBK+lk6sFHdfY7RDslL9SexkX7eOz536geeDUnCLiDz71wZ3PG5T7Nzi9qOt2P8MVpQUCLix6P4WI18yF9vrRiVLyyggUQMUuCw6GsrYQ== 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:(13230031)(4636009)(39860400002)(396003)(136003)(376002)(346002)(230922051799003)(64100799003)(82310400011)(1800799012)(451199024)(186009)(40470700004)(36840700001)(46966006)(4001150100001)(7696005)(2906002)(54906003)(70206006)(6916009)(53546011)(7636003)(356005)(36756003)(86362001)(316002)(8936002)(4326008)(8676002)(5660300002)(55016003)(40480700001)(70586007)(966005)(478600001)(40460700003)(41300700001)(36860700001)(82740400003)(47076005)(6286002)(26005)(336012)(426003)(1076003)(2616005)(83380400001)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:17:27.8018 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6147f0b3-cc76-4879-c5c3-08dbfa3260a1 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: DS3PEPF000099DE.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8426 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.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 12/13/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/commit/?h=22.11-staging&id=ae7a0f62331661cbe4d7390542bdc3e3ef98eb3a Thanks. Xueming Li --- >From ae7a0f62331661cbe4d7390542bdc3e3ef98eb3a Mon Sep 17 00:00:00 2001 From: Timothy Miskell Date: Thu, 19 Oct 2023 17:26:10 +0000 Subject: [PATCH] net/ice: fix L1 check interval Cc: Xueming Li [ upstream commit ff628a22c51f9cc5f69c715005a42456a2aec4f6 ] For edge cases where the transceiver is physically inserted first and immediately afterwards the DPDK PF is started the LSC event may occur outside the current setting for the maximum check interval window. This change lengthens the check interval to account for this along with other reported cases where the link event may be longer than 1 second. Fixes: cf911d90e366 ("net/ice: support link update") Signed-off-by: Timothy Miskell Tested-by: Jonathan Tsai Acked-by: Qi Zhang --- .mailmap | 2 ++ drivers/net/ice/ice_ethdev.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 7631227cd3..48267a54f2 100644 --- a/.mailmap +++ b/.mailmap @@ -653,6 +653,7 @@ John Romein John W. Linville Jonas Pfefferle Jonathan Erb +Jonathan Tsai Jon DeVree Jon Loeliger Joongi Kim @@ -1363,6 +1364,7 @@ Tianli Lai Tianyu Li Timmons C. Player Timothy McDaniel +Timothy Miskell Timothy Redaelli Tim Shearer Ting Xu diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index b0c8e843f7..332af8eeb5 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3956,8 +3956,8 @@ ice_atomic_write_link_status(struct rte_eth_dev *dev, static int ice_link_update(struct rte_eth_dev *dev, int wait_to_complete) { -#define CHECK_INTERVAL 100 /* 100ms */ -#define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */ +#define CHECK_INTERVAL 50 /* 50ms */ +#define MAX_REPEAT_TIME 40 /* 2s (40 * 50ms) in total */ struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct ice_link_status link_status; struct rte_eth_link link, old; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.887473600 +0800 +++ 0054-net-ice-fix-L1-check-interval.patch 2023-12-11 17:56:23.047652300 +0800 @@ -1 +1 @@ -From ff628a22c51f9cc5f69c715005a42456a2aec4f6 Mon Sep 17 00:00:00 2001 +From ae7a0f62331661cbe4d7390542bdc3e3ef98eb3a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ff628a22c51f9cc5f69c715005a42456a2aec4f6 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index c0ab6d090b..d91775daf1 100644 +index 7631227cd3..48267a54f2 100644 @@ -27 +29 @@ -@@ -676,6 +676,7 @@ John Romein +@@ -653,6 +653,7 @@ John Romein @@ -35 +37 @@ -@@ -1417,6 +1418,7 @@ Tianli Lai +@@ -1363,6 +1364,7 @@ Tianli Lai @@ -44 +46 @@ -index 305077e74e..6ef06b9926 100644 +index b0c8e843f7..332af8eeb5 100644 @@ -47 +49 @@ -@@ -3992,8 +3992,8 @@ ice_atomic_write_link_status(struct rte_eth_dev *dev, +@@ -3956,8 +3956,8 @@ ice_atomic_write_link_status(struct rte_eth_dev *dev,