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 67122431D5 for ; Sun, 22 Oct 2023 16:28:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 60A0C40DF8; Sun, 22 Oct 2023 16:28:42 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2050.outbound.protection.outlook.com [40.107.94.50]) by mails.dpdk.org (Postfix) with ESMTP id 9C6C4402CE for ; Sun, 22 Oct 2023 16:28:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zk0gsozcJbL7G9A3nZnffi+4f141OPXQo+EGzaxzf02bJ7GR7/tIYLlcUVPpy6Wn+LhzVMJSvNGXw6dj2PkbGnXRgL+EmQ92U5jk0ulWU3riDF8cB7RzjT/0ewA4MSVCY/ikIKMfDOBjzoKw/EOju/7e7X2RQYAlufpesxsyg7xkOxL5vIxtaWv3Oqe7168IklMdqQnRLUhz9E2i024NcagaTaXGtD/uV7+g4x6LdE82APAAKbDuPNwHWf/j1ZJq0n+1AMvruTN77pA5+kF5dncMJgU6MW+KDu1cL2FwZoMeW9ddXqpqq70piurJCC29Edb6YaeIvXuFvWcl7rCu+A== 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=cvMPk4mosOmtX4HSTKvSl/8FS36Qe2lsKVmAGcg2Os8=; b=bV9t7ywQtfpQ25/6Klml3R63Dzh3RvhWHItpQksoZ+WXVazuVL6pLNzYrk2KgbB1VBqYq0sdYEw6rZmazdnofhEIc6tk/RsKjj5RbI9427B1W//Ul3I2aBsdxCCLb6hSMtNWsJ9gVwAWA8g48mdHeWL40Rcd+Hz4UK2wOLwkH8vM9wcHw7KPkdRPqaQ1G+FSGk+/eT+Q2MhgShj4ZZDLflBQfThHMjmL/5WPxXizN6CeQBg6g1McwjXgDZJszjlf9ZdjGAuhRBJjsk2cMtdgycMWBiLuRAv7IqUJIJr7/aEuS3ON1i3jEeMgeiHAxmFqcZVpt3uzypvav/+TeBnEoQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=cvMPk4mosOmtX4HSTKvSl/8FS36Qe2lsKVmAGcg2Os8=; b=WneVDDK3BEWb2pAKC34i0V7XDKauOTfpnimQJcElJAyM2TVy0WQfiBq6LpkMzIsKPHXLo1kYEc0ASrw1EdIxZoFoRv0R0EsJDhLFNfqmbQdRrhIuk+0e7KuIzJJy0sUUAyNRGPOeewETBqfaFO/yuj3MLy/4HvPlsf3XvOVbyggDKtg6wgsKZhCXzP6gt+/SnySypvokFzrd5RyLyh7mJi70d/NEOjJWW8ZLmb392qrIpMmWTWPy7EQv6tzAe1t08hd4yFAJ4EFNFmnzrSLOAVwtzvzalIK6pDH8fRWasd/D2zjAwG8Xq/gSPj9ma0MSnHZ6J36pRJyQFjw3bqZ6SA== Received: from DS7PR05CA0075.namprd05.prod.outlook.com (2603:10b6:8:57::16) by DM4PR12MB5230.namprd12.prod.outlook.com (2603:10b6:5:399::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31; Sun, 22 Oct 2023 14:28:38 +0000 Received: from DS1PEPF0001708F.namprd03.prod.outlook.com (2603:10b6:8:57:cafe::c7) by DS7PR05CA0075.outlook.office365.com (2603:10b6:8:57::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:28:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS1PEPF0001708F.mail.protection.outlook.com (10.167.17.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:28:38 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:28:23 -0700 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; Sun, 22 Oct 2023 07:28:22 -0700 From: Xueming Li To: Pavan Nikhilesh CC: dpdk stable Subject: patch 'event/cnxk: fix context flush in port cleanup' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:29 +0800 Message-ID: <20231022142250.10324-61-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-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: DS1PEPF0001708F:EE_|DM4PR12MB5230:EE_ X-MS-Office365-Filtering-Correlation-Id: 00d88ed3-548f-4d01-d697-08dbd30b2eac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yOAx2IClxE2DVJJ4jQRQo0p0ZjFQRrDZx523VpDs3Els2s4uT79bKDILnOgG7cc66zpFoEuoerOGJ8hUkGGCe2/DeP+mzrCJQnz7e7rk7HS0ycCkcNMYkJ48ahU+4x8uUkpvN3DOdoTfc27hGoYUwSawSXeRx3hg0JXI1CvFTLC3MI3BKphBqO5hAF+x+xjvy3i9A1NGYxU+GauocQUk/NOMXGMYVq3VAPAmV9j6jgCIXyHH6SVVgMJyWSH7qN49veE45Za9xYepU91Pl9vbc45zNqAkeduz5R8J9EXxZqo03BetynUDKEY/dytRQ5hm9Zbj/RJ6iO46au/EMOsrGuuxXOYWPcPQZxhh6zYv/gxzxWKZXi5/0/KLzWkm2CLGyan8aqGjBcpg3BCnS6zzt/c4dvomIo4/RAhKGXDkHdEmWe3YUqwZe06+ScRJRH/4uecKwv2tpwo1brNx3p+IB38dIEL5i6O5wJjKR6+LHdRA9R0TWYJegc4M+OdYHS4I/VUiaet1TdAb3B5aWgK2bawmTARI1KwzPKqF/nZ7PaiM6xc1pY4NWuOnEjB4jZeec0Stxz+1JPKCCDUDLRwChauRA0QVgTcnUkrjll9gUQvdJTjQ976sX1ZioWRqlEhpZZPVk2xN6Lhazc9iVjqXlEaykxOKMRcUVTKyQ+XIXIqb2ma3a03cDKGkI7yzAoY+ycsUHxfpLj4ACDrblJLPwe8xVjRRI/FUd/MJlPQN62U3IsQYFrHjaV1OS2KSrse2p3ybm/qm9FBXzV5/5fN/iadXLfbbyJ6jV1gcYHjR89E= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(396003)(376002)(136003)(346002)(39860400002)(230922051799003)(451199024)(64100799003)(82310400011)(186009)(1800799009)(46966006)(36840700001)(40470700004)(40480700001)(26005)(6286002)(2616005)(1076003)(426003)(336012)(16526019)(83380400001)(53546011)(7696005)(82740400003)(86362001)(36756003)(7636003)(356005)(47076005)(36860700001)(2906002)(4001150100001)(966005)(478600001)(8936002)(8676002)(4326008)(41300700001)(6916009)(316002)(70586007)(70206006)(5660300002)(40460700003)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:28:38.2830 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 00d88ed3-548f-4d01-d697-08dbd30b2eac 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0001708F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5230 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 11/15/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=6d49fdbd99d28b4d5426d9e30ad0d0bbd4845afa Thanks. Xueming Li --- >From 6d49fdbd99d28b4d5426d9e30ad0d0bbd4845afa Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Sat, 9 Sep 2023 22:27:46 +0530 Subject: [PATCH] event/cnxk: fix context flush in port cleanup Cc: Xueming Li [ upstream commit 5808b30ab74f04b687f4487718849f935bcab607 ] Flush currently held flow context during event port cleanup. Fixes: e8594de2731d ("event/cnxk: implement event port quiesce function") Signed-off-by: Pavan Nikhilesh --- drivers/event/cnxk/cn10k_eventdev.c | 18 ++++++++++++++---- drivers/event/cnxk/cn9k_eventdev.c | 25 +++++++++++++++++++------ 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/drivers/event/cnxk/cn10k_eventdev.c b/drivers/event/cnxk/cn10k_eventdev.c index 77014ada00..d8e7c83462 100644 --- a/drivers/event/cnxk/cn10k_eventdev.c +++ b/drivers/event/cnxk/cn10k_eventdev.c @@ -197,12 +197,14 @@ cn10k_sso_hws_reset(void *arg, void *hws) cnxk_sso_hws_swtag_untag(base + SSOW_LF_GWS_OP_SWTAG_UNTAG); plt_write64(0, base + SSOW_LF_GWS_OP_DESCHED); + } else if (pend_tt != SSO_TT_EMPTY) { + plt_write64(0, base + SSOW_LF_GWS_OP_SWTAG_FLUSH); } /* Wait for desched to complete. */ do { pend_state = plt_read64(base + SSOW_LF_GWS_PENDSTATE); - } while (pend_state & BIT_ULL(58)); + } while (pend_state & (BIT_ULL(58) | BIT_ULL(56))); switch (dev->gw_mode) { case CN10K_GW_MODE_PREF: @@ -711,11 +713,16 @@ cn10k_sso_port_quiesce(struct rte_eventdev *event_dev, void *port, cn10k_sso_hws_get_work_empty(ws, &ev, (NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_REAS_F | NIX_RX_MULTI_SEG_F | CPT_RX_WQE_F); - if (is_pend && ev.u64) { + if (is_pend && ev.u64) if (flush_cb) flush_cb(event_dev->data->dev_id, ev, args); + ptag = (plt_read64(ws->base + SSOW_LF_GWS_TAG) >> 32) & SSO_TT_EMPTY; + if (ptag != SSO_TT_EMPTY) cnxk_sso_hws_swtag_flush(ws->base); - } + + do { + ptag = plt_read64(ws->base + SSOW_LF_GWS_PENDSTATE); + } while (ptag & BIT_ULL(56)); /* Check if we have work in PRF_WQE0, if so extract it. */ switch (dev->gw_mode) { @@ -741,8 +748,11 @@ cn10k_sso_port_quiesce(struct rte_eventdev *event_dev, void *port, if (ev.u64) { if (flush_cb) flush_cb(event_dev->data->dev_id, ev, args); - cnxk_sso_hws_swtag_flush(ws->base); } + cnxk_sso_hws_swtag_flush(ws->base); + do { + ptag = plt_read64(ws->base + SSOW_LF_GWS_PENDSTATE); + } while (ptag & BIT_ULL(56)); } ws->swtag_req = 0; plt_write64(0, ws->base + SSOW_LF_GWS_OP_GWC_INVAL); diff --git a/drivers/event/cnxk/cn9k_eventdev.c b/drivers/event/cnxk/cn9k_eventdev.c index 4f362a8e80..803e7ddd07 100644 --- a/drivers/event/cnxk/cn9k_eventdev.c +++ b/drivers/event/cnxk/cn9k_eventdev.c @@ -223,16 +223,16 @@ cn9k_sso_hws_reset(void *arg, void *hws) cnxk_sso_hws_swtag_untag( base + SSOW_LF_GWS_OP_SWTAG_UNTAG); plt_write64(0, base + SSOW_LF_GWS_OP_DESCHED); + } else if (pend_tt != SSO_TT_EMPTY) { + plt_write64(0, base + SSOW_LF_GWS_OP_SWTAG_FLUSH); } /* Wait for desched to complete. */ do { pend_state = plt_read64(base + SSOW_LF_GWS_PENDSTATE); - } while (pend_state & BIT_ULL(58)); - + } while (pend_state & (BIT_ULL(58) | BIT_ULL(56))); plt_write64(0, base + SSOW_LF_GWS_OP_GWC_INVAL); } - if (dev->dual_ws) dws->swtag_req = 0; else @@ -846,12 +846,25 @@ cn9k_sso_port_quiesce(struct rte_eventdev *event_dev, void *port, base, &ev, dev->rx_offloads, dev->dual_ws ? dws->lookup_mem : ws->lookup_mem, dev->dual_ws ? dws->tstamp : ws->tstamp); - if (is_pend && ev.u64) { + if (is_pend && ev.u64) if (flush_cb) flush_cb(event_dev->data->dev_id, ev, args); - cnxk_sso_hws_swtag_flush(ws->base); - } + + ptag = (plt_read64(base + SSOW_LF_GWS_TAG) >> 32) & SSO_TT_EMPTY; + if (ptag != SSO_TT_EMPTY) + cnxk_sso_hws_swtag_flush(base); + + do { + ptag = plt_read64(base + SSOW_LF_GWS_PENDSTATE); + } while (ptag & BIT_ULL(56)); + + plt_write64(0, base + SSOW_LF_GWS_OP_GWC_INVAL); } + + if (dev->dual_ws) + dws->swtag_req = 0; + else + ws->swtag_req = 0; } static int -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:36.604021000 +0800 +++ 0060-event-cnxk-fix-context-flush-in-port-cleanup.patch 2023-10-22 22:17:34.276723700 +0800 @@ -1 +1 @@ -From 5808b30ab74f04b687f4487718849f935bcab607 Mon Sep 17 00:00:00 2001 +From 6d49fdbd99d28b4d5426d9e30ad0d0bbd4845afa Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5808b30ab74f04b687f4487718849f935bcab607 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index cae2efbb69..cf186b9af4 100644 +index 77014ada00..d8e7c83462 100644 @@ -21 +23 @@ -@@ -204,12 +204,14 @@ cn10k_sso_hws_reset(void *arg, void *hws) +@@ -197,12 +197,14 @@ cn10k_sso_hws_reset(void *arg, void *hws) @@ -37,2 +39 @@ -@@ -587,11 +589,16 @@ cn10k_sso_port_quiesce(struct rte_eventdev *event_dev, void *port, - +@@ -711,11 +713,16 @@ cn10k_sso_port_quiesce(struct rte_eventdev *event_dev, void *port, @@ -40 +41,2 @@ - (NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_REAS_F | NIX_RX_MULTI_SEG_F); + (NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_REAS_F | + NIX_RX_MULTI_SEG_F | CPT_RX_WQE_F); @@ -56 +58 @@ -@@ -615,8 +622,11 @@ cn10k_sso_port_quiesce(struct rte_eventdev *event_dev, void *port, +@@ -741,8 +748,11 @@ cn10k_sso_port_quiesce(struct rte_eventdev *event_dev, void *port, @@ -70 +72 @@ -index f77a9d7085..fe6f5d9f86 100644 +index 4f362a8e80..803e7ddd07 100644 @@ -73 +75 @@ -@@ -222,16 +222,16 @@ cn9k_sso_hws_reset(void *arg, void *hws) +@@ -223,16 +223,16 @@ cn9k_sso_hws_reset(void *arg, void *hws) @@ -93 +95 @@ -@@ -686,12 +686,25 @@ cn9k_sso_port_quiesce(struct rte_eventdev *event_dev, void *port, +@@ -846,12 +846,25 @@ cn9k_sso_port_quiesce(struct rte_eventdev *event_dev, void *port,