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 6CD7041D8D for ; Mon, 27 Feb 2023 08:08:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 66E9340A84; Mon, 27 Feb 2023 08:08:29 +0100 (CET) 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 C88F440A84 for ; Mon, 27 Feb 2023 08:08:27 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K7KpxO9vBFUedfRDUdfEGdhO9sSMkXj6a/pjnJ2Sn3MsdM3SvtrncuWemDAfOcUmH/ue7zkYUtQ75YAqb3Hp7oszutZTK0JDSA1taqqXQJbvH5eL7rWfV37YJm4hCklzcpy7wWMuwcKXjXMpmjvJVkzSI6vQKYwa8wsjS/9LpDrF1SxB4ZL8BB2eCXeH8dM7Nl4xj2gvMAijMYx2D4n52/lfizCY97l6mmOPYUBbZVpYLsr/ffNQh4uYmpCnT3xDemNi1d5IRCT3SpfFgknmndMDa/odLy76DN0kEJg/DARKQu5GjuXUQBxuJKe0Gr5rgWbqrqdXgHnp7IHnSDsF5g== 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=7AZCwL+xhzOV7ne88fvbA/EqpJ8HUHR5bUj5pF18wS8=; b=UkT/e+BNSFwy9iXHZCIUr1P2EZuh+aGFcRzOZnai6YqPBymtNuAmzSPBnYTAcpMJxkP6Epn/fv5AnC+6lDQ7E3/vixmXUPng+ANtO+kfJzAafsWBdzjqlwxwGi8GSGyOJMxg/LBBLG2YpsSpdxN/ASZzU3W9H4E3wPZ8+8LBcWps2VRe1w/Mv+EyN+XExVhY+RXvu6/Ns/FP6rlWLGT+5LA7ATiL6Q9ss8/rIKQAXn8xC8O/RrxNW2XpLh+MjUG10Uy9r0ugo8DsmOq0kOJH4hjeq4NFLRWt3RP8+zudvkf+tkrIWItYPu1ofjqSHsw9O9RdWITl/TWUPMZ3qBQY2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.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=7AZCwL+xhzOV7ne88fvbA/EqpJ8HUHR5bUj5pF18wS8=; b=PRzTUsR2//9RjbHkn0UWcHgwc6IxAPKTJTt7AwrBGuxY7oWWb5vPnFw6VIrfqKXihTms/TRKKWeUEyiGV5Wa+MLoRj4HpUVWhJrdeXryDyT2zdKTOLttgfctAL0N2hgUNr4MeC9dpfuPgcghTcIuXLclhA+CC/lg6zq/QcW5gTMVsSPjd8XpbAqnw50Rlmdl5pXzq9TbhVRC8iTHDkjkna15qk/HcxDsa/JYxS1yCrqkthgaxO2t3dTZFEQW+N6YiPNxQamo6Zf8Vj+oFt+gSjEN3vSNz2rTxOeyldeD5coWZzkrxe+k0gh3v9Q75/LqGph1sHZBANmj6d20KyWkhA== Received: from MW4PR02CA0023.namprd02.prod.outlook.com (2603:10b6:303:16d::16) by CH3PR12MB8536.namprd12.prod.outlook.com (2603:10b6:610:15e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:08:23 +0000 Received: from CO1NAM11FT100.eop-nam11.prod.protection.outlook.com (2603:10b6:303:16d:cafe::1e) by MW4PR02CA0023.outlook.office365.com (2603:10b6:303:16d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.28 via Frontend Transport; Mon, 27 Feb 2023 07:08:23 +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 CO1NAM11FT100.mail.protection.outlook.com (10.13.175.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:08:22 +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.36; Sun, 26 Feb 2023 23:08:04 -0800 Received: from nvidia.com (10.126.231.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, 26 Feb 2023 23:08:02 -0800 From: Xueming Li To: Rahul Bhansali CC: dpdk stable Subject: patch 'event/cnxk: wait for CPT flow control on WQE path' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:59:33 +0800 Message-ID: <20230227070107.15664-65-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT100:EE_|CH3PR12MB8536:EE_ X-MS-Office365-Filtering-Correlation-Id: a0794ab7-ac28-4063-9d95-08db18916a03 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6mCNsP48vf7DuTyd8qY8JN8BfycA8OgKE6bC9XvyCJdF2hIE1i+HioQqfdJQT/ibnJbyz8AuEe1cg6nz67MY2rQ9VfY9L8YjraMmiVhVXLLts07jX7+bNDjetp75XkVl3eeI1aX7DypBY2Pwgnll52dri4CWwksA+ms8vRhdw4xgPRscyPoOZt1m3s7XdHIS/bhuiU1ZeI89u6xEkyc4wLaQ99ce9ce1m0jRCsuXNMQ4hXuU8xzgL2cEw4ep+lPbxlpnTPdUDuen2Di4eMm0/wDoMMyAKo/3iGtJFZWjuVCYhzGTomojhbNLDYEcME3jcExHtchxTiO9UhrMRm3CJy1Vingdj3fzCdY5sAIsyRM3RvN2cFg3fmHGAvug+fuQqHRHj+qGaajuiWs+3RgtAHfQwLjQuSXpqwltxJc+/47DwzP2y4SQHuQQ4ge2xbmEbdLNQuBieiDEkcMmyLE1OY97XYSeormjjAn0w6VAmG3Bj0fowFsbXCvPuYinnjePZ9hXKFYs5ueDr8e1qSujy55GOb9YLddlg+U+pgcBJFZSJ4Tju+dct+DV/h8jE8fAMCBf88stXiAYCZYUhkxMysBgSGVgk6wZnbvTY6/xZAyLaey0ZLuldZnNLrE5JhMVRZ5492m9W22aiQp39sM9suuxDEiTQgNSWaDRQ5c5KmdMUiD20lWPMulp4CPZp245LNdUgbb98p0UXDHb+JURysTNn36WCnzcxlQdgwQjZ6ltx0Fiqu7g8IvfDRSuvDWivgpBClw+BxegJZe2Kka9yS5NEVZHWRGheiYF5SiAw7mNFWWd7E7LYHLVRdrQJ3v6 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:(13230025)(4636009)(396003)(39860400002)(136003)(376002)(346002)(451199018)(40470700004)(36840700001)(46966006)(40460700003)(16526019)(6286002)(186003)(7636003)(82740400003)(83380400001)(356005)(8936002)(6916009)(4326008)(70586007)(70206006)(41300700001)(8676002)(2906002)(36860700001)(5660300002)(34020700004)(7696005)(55016003)(40480700001)(336012)(47076005)(478600001)(426003)(1076003)(6666004)(26005)(53546011)(966005)(2616005)(316002)(36756003)(82310400005)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:08:22.9441 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a0794ab7-ac28-4063-9d95-08db18916a03 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: CO1NAM11FT100.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8536 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 03/01/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=0a78560065dbab6199f0fbd477fafdffe102024a Thanks. Xueming Li --- >From 0a78560065dbab6199f0fbd477fafdffe102024a Mon Sep 17 00:00:00 2001 From: Rahul Bhansali Date: Thu, 19 Jan 2023 11:23:15 +0530 Subject: [PATCH] event/cnxk: wait for CPT flow control on WQE path Cc: Xueming Li [ upstream commit d6ef4695c3b449259b29225e62bb6116ad420227 ] Wait for CPT flow control on WQE path to avoid CPT queue overflow and thereby a CPT misc interrupt. Fixes: 1a7da795f64a ("net/cnxk: support Tx security offload on cn9k") Signed-off-by: Rahul Bhansali --- drivers/event/cnxk/cn9k_worker.h | 1 + drivers/net/cnxk/cn9k_tx.h | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/drivers/event/cnxk/cn9k_worker.h b/drivers/event/cnxk/cn9k_worker.h index 4c3932da47..d3c5180fbc 100644 --- a/drivers/event/cnxk/cn9k_worker.h +++ b/drivers/event/cnxk/cn9k_worker.h @@ -730,6 +730,7 @@ cn9k_sso_hws_xmit_sec_one(const struct cn9k_eth_txq *txq, uint64_t base, rte_io_wmb(); cn9k_sso_txq_fc_wait(txq); + cn9k_nix_sec_fc_wait_one(txq); /* Write CPT instruction to lmt line */ vst1q_u64(lmt_addr, cmd01); diff --git a/drivers/net/cnxk/cn9k_tx.h b/drivers/net/cnxk/cn9k_tx.h index 404edd6aed..7362025a34 100644 --- a/drivers/net/cnxk/cn9k_tx.h +++ b/drivers/net/cnxk/cn9k_tx.h @@ -388,6 +388,16 @@ cn9k_nix_xmit_prep_lmt(uint64_t *cmd, void *lmt_addr, const uint32_t flags) roc_lmt_mov(lmt_addr, cmd, cn9k_nix_tx_ext_subs(flags)); } +static __rte_always_inline void +cn9k_nix_sec_fc_wait_one(const struct cn9k_eth_txq *txq) +{ + uint64_t nb_desc = txq->cpt_desc; + uint64_t *fc = txq->cpt_fc; + + while (nb_desc <= __atomic_load_n(fc, __ATOMIC_RELAXED)) + ; +} + static __rte_always_inline uint64_t cn9k_nix_xmit_submit_lmt(const rte_iova_t io_addr) { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:43.016620200 +0800 +++ 0066-event-cnxk-wait-for-CPT-flow-control-on-WQE-path.patch 2023-02-27 14:08:40.789237000 +0800 @@ -1 +1 @@ -From d6ef4695c3b449259b29225e62bb6116ad420227 Mon Sep 17 00:00:00 2001 +From 0a78560065dbab6199f0fbd477fafdffe102024a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d6ef4695c3b449259b29225e62bb6116ad420227 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org