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 31953A0A0E for ; Mon, 10 May 2021 18:21:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 266AA4003E; Mon, 10 May 2021 18:21:25 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-eopbgr770072.outbound.protection.outlook.com [40.107.77.72]) by mails.dpdk.org (Postfix) with ESMTP id C8B4F410FF for ; Mon, 10 May 2021 18:21:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S4gCJAxd/x7riMxYLlZ+QsHD/pfnYFt2fETajIPN9n0hNRUyxG1Cldl/Pjxkx0b1DEtZ1P4+9CM2bc2wh6S2bMkQxrADPAmM7Dq2H5CQS267Nr4q0eRRfpj4FPU156Q11GfdBMMQTQ51xjCDg9mdw8oK05D1gVyZeFTDF10/FiUbVvpCNmQ9FVU05dDNDXgSfDHdrwX7+3swcyZA1WQBCYfzH08QNSBGJTerV1FzzcCfRJU1t3Cbmc8D5+lipijC2f2+OO3royETNrv98sDP20tf4KaC6Glp4f8RDbiYXDNifNIjYlgKLGQ8bfM2VAIydADB7oBZYYDNIf89jsoKcQ== 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-SenderADCheck; bh=TEsyE801pdY/DXfkoNho9SlnGtB5XAy3x0MIL6lJU/w=; b=oT1QnT7Afe9WwWXbKlpzmL9h5LX0y+Br06xggCx2Cl8GaVZCAAk4HfdwqWeoMSt3iUa4UJQUs9I2PAr1HyUAsDY7hKYE7KuTNgn2OD8b8Aw19QGsdY8p8L8ydbljrpW4ZOrZbo7mTromZWahx5u7LrunWr18RKF+CP0vyfKQbaigPtoXnbpyPkwg0pwS3uMrvLtdD3RB4WN1R/fYIjyKDwe53IGdI2KKzPMM9nyFnd1ZqlrgG3NbGzP/772Jti452bjkPBt0c24rVJ8c0JbsbxsOx6JxXdHe/X0KpC71B42eg/ldmAWNGlU64xTzu0SFgkEqBb3cQlXSIBlmbym1Ng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=TEsyE801pdY/DXfkoNho9SlnGtB5XAy3x0MIL6lJU/w=; b=X+Op12KhFgSJg2rHQ0IdkGNoGZTA9hOG40vO5tsOuq9DKLlj0WGaPEbJIW/QUTY2htcJX+RQrZ2txVQNbz4aniMTWeskLv27GOlrMQ6YxRzMrOjbcWPD/ME1Oix9SKkqi1JGwZ+lxpl+SSCpK8GzC7HKwEA65ykpl8euScUw7WM0iEAFdB4iTfV6w4UOqCPjC1FLc/ABWIZfHXWnL8Fxs3fDpIdXWvHl3VEIWCUIJnQs1jodum+m9P/eil3kuQDaRYKHILsUU6qxwmDcnuJT581OgmyUg0ykE1eDHpYwzCeTKq5M3DDUUD+Lr9K4JK7bVAPsI7DjEc799QGvsc21Pg== Received: from BN9PR03CA0123.namprd03.prod.outlook.com (2603:10b6:408:fe::8) by BL0PR12MB4914.namprd12.prod.outlook.com (2603:10b6:208:1c4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:21:20 +0000 Received: from BN8NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:408:fe:cafe::d2) by BN9PR03CA0123.outlook.office365.com (2603:10b6:408:fe::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:21:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; huawei.com; dkim=none (message not signed) header.d=none;huawei.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 BN8NAM11FT059.mail.protection.outlook.com (10.13.177.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:21:20 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:20:55 +0000 From: Xueming Li To: Chengchang Tang CC: Luca Boccassi , Min Hu , dpdk stable Date: Tue, 11 May 2021 00:02:08 +0800 Message-ID: <20210510160258.30982-179-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f70a2a6-4e51-4eb5-30ee-08d913cfa5b5 X-MS-TrafficTypeDiagnostic: BL0PR12MB4914: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2BJnO7JP6UtrTartoNnRM+k5Foio0XCmw8s9g8lzJgUWelAJ8if9lYBPNcWFf1YnVlGPusVIw8P+gm9F8wRW+ggRmRhgnKsxFHlfpWqo2V2pZ5wx7obqhRDY6AdPUL7XKjlnt4Lw08CBMjO0NzD6+UEUzlrR8BHAr/ytPGCVpmsUHVKJQRvFGmug5EHDfn/2ZkjwVq6bEdk2ReLg49SuJaXYooX/6ZFclQx6HE5yDTJKACROE9E8rHWhEtQVE9IKBk0ZkqWf7Hdq3s+hUYMpvGTMFrIAQq8JZPYHDq17cHMmL8JnNrOODzCxB0n/4dqDzSmp1dXj4H5X2JpDNzJGSLpmJLSTjOYS04rzkf0ilEuRk6/ksxbJeQDVrwdKQKE/oTt/oNkq7xtO3zzsp1RUFrutaY8bDdH3Gokars7iEaDrubfFMGpjW5hPZ8AM9JlUXMRxLz4FLFvj/tuqiHJ2dWpaUiEvwltx3yYGSbONqGeYiEk9fRql3Pj32KbwOrUiwXXT7vjlK7KyQuPAPzO6oZmjk5MWZ9hm1CdIGaFpraK/pYNHG006MM3jcgD9jKic6CMoDIiVMjgSlG0AHhSqm3SO6b9N9D+PrwXLpHXW2MX6ysmROMeTKqwSS0jWOaLlMK3F2f6yuoKLNuxI56yvY/P7PCRZk3zjcHRrJMuSIJh+SR2EWHQXAYtYBXDGi8nxduRoPpp32tXbsQ/g6uVR39ndhkfENj7BTRWxQrNnWl3mSXKBnTO3m643DWQsRugPkvbZCUz7MCRaaLOvtcCDFQ== 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)(346002)(39860400002)(136003)(396003)(376002)(36840700001)(46966006)(426003)(1076003)(336012)(356005)(86362001)(16526019)(6916009)(2616005)(36756003)(7636003)(82740400003)(6286002)(36906005)(54906003)(316002)(478600001)(186003)(70206006)(70586007)(4326008)(53546011)(55016002)(966005)(5660300002)(8936002)(7696005)(83380400001)(47076005)(26005)(36860700001)(82310400003)(6666004)(2906002)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:21:20.7170 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7f70a2a6-4e51-4eb5-30ee-08d913cfa5b5 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: BN8NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4914 Subject: [dpdk-stable] patch 'net/hns3: fix timing in resetting queues' has been queued to stable release 20.11.2 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.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 05/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/da8413c234cd0cd487f5d4474875a49a555600c6 Thanks. Xueming Li --- >From da8413c234cd0cd487f5d4474875a49a555600c6 Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Sat, 10 Apr 2021 09:11:18 +0800 Subject: [PATCH] net/hns3: fix timing in resetting queues Cc: Luca Boccassi [ upstream commit fde636caf49a96138602d3232af6ec5ac4f15538 ] During the task queue pairs reset, the getimeofday is used to obtain the timestamp to determine whether the command execution times out. But gettimeofday is not monotonous, it can be modified by system administrators, so the timing may not be accurate or even cause the loop to wait consistently. And actually, in this scenario, it is not necessary to obtain the timestamp. This patch removes the operation of obtaining the timestamp from the task queue pairs reset function. Fixes: bba636698316 ("net/hns3: support Rx/Tx and related operations") Signed-off-by: Chengchang Tang Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_rxtx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index 4f67d73de4..ba566cdba7 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -625,8 +625,8 @@ static int hns3pf_reset_tqp(struct hns3_hw *hw, uint16_t queue_id) { #define HNS3_TQP_RESET_TRY_MS 200 + uint16_t wait_time = 0; uint8_t reset_status; - uint64_t end; int ret; /* @@ -639,17 +639,18 @@ hns3pf_reset_tqp(struct hns3_hw *hw, uint16_t queue_id) hns3_err(hw, "Send reset tqp cmd fail, ret = %d", ret); return ret; } - end = get_timeofday_ms() + HNS3_TQP_RESET_TRY_MS; + do { /* Wait for tqp hw reset */ rte_delay_ms(HNS3_POLL_RESPONE_MS); + wait_time += HNS3_POLL_RESPONE_MS; ret = hns3_get_tqp_reset_status(hw, queue_id, &reset_status); if (ret) goto tqp_reset_fail; if (reset_status) break; - } while (get_timeofday_ms() < end); + } while (wait_time < HNS3_TQP_RESET_TRY_MS); if (!reset_status) { ret = -ETIMEDOUT; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:31.210349100 +0800 +++ 0180-net-hns3-fix-timing-in-resetting-queues.patch 2021-05-10 23:59:26.620000000 +0800 @@ -1 +1 @@ -From fde636caf49a96138602d3232af6ec5ac4f15538 Mon Sep 17 00:00:00 2001 +From da8413c234cd0cd487f5d4474875a49a555600c6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit fde636caf49a96138602d3232af6ec5ac4f15538 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index 1074d8a3a4..469d8de5df 100644 +index 4f67d73de4..ba566cdba7 100644