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 5F8BD45CE3 for ; Mon, 11 Nov 2024 07:33:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 57E8640E26; Mon, 11 Nov 2024 07:33:39 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2079.outbound.protection.outlook.com [40.107.236.79]) by mails.dpdk.org (Postfix) with ESMTP id 2006940685 for ; Mon, 11 Nov 2024 07:33:38 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=S0xPqzCqtgzyGZM2RkyVurxNfYwxd+ceO66JOkDcFuyBs+ByDobeITr4TEb1L4QMOoWp1DEK07KYlfM28+EUVwb2vCTRLEqBzTJWF4OGreHAWhDCvYDxCJL88xuVFxIrbhzdYiYF1uFF6k8zzmW8GHtH0seiUQXz7gubu0+tBd1xXuzrTDA9fbWw6pbMdiO/T1gPM3lnTsutRr2T4QoPnDpbZqc+l5+iLVxonwB9StfQ8vuAzEns/k0pzH2dq4x7I2cNu0Hl7n3CtIo18c5DEas+w9WMcNafaj7zGkvZzKqUeGfS5f7ws+FJ2+3Ce/X0bHt3nHrGSUcTHl2xh5xu2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=8gtrr/3A9AKgF32Z43AQlQ9iirOTJxs4csSrGSIBpyg=; b=V8HvLN57A2L2VkS3NpEDu4mTg7qiBgSrdrMxF04POcIHcZ62krypZROxxMHoPubaokik5c2a0gnsRpknpRwUBt8U8sUz6PtYLo2rnqOsWfDGnuhqZvN5M7JE43P8h6KhivSIURuHmWzYqtrgn10p+CHkzql68AckgLjCZ1M+jpl6LmszgiiHCHn1wOH5TYJQu3EW6NgtT478pMljUoabEyTLIXRa100od2z1DX1eFfpGnKAWdK+5CY/MDQPOBQDT4H5Ye2WMPvNbeyNTdCSUaN1ZhTL7fWc5Y5MZm6fn1NApmZs4SiYUV2oRQgHg60Rom0rRuUDPg/V56063/XDwEA== 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 (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=8gtrr/3A9AKgF32Z43AQlQ9iirOTJxs4csSrGSIBpyg=; b=ZCyaqt4WvPjP4PNEnxBCQW4Bu9otlsm6r7h3Np/NpYXJlCDoVm7Es6ccLQ6O0Yd8yreORNyVUyu+6OaLMJA8m6oCzsICTblN+chUM9epGKP8z498M/RAyguhpmW7+V/Dh512pdWWQ4jRSsuKXkAr3lALgSMtCl1LLvLqshc19St4HmkdUgyBKeN/KmqCnfhYTCKNm+kM+/8uJ9avUWDlkaoKVgPy0B7zYCreVdm7u+SJnfMlYrmF7ILbhyGyZdCkT952kwFIkzy3lMatK0z1ixCVGBj3rRFjK0f+pqo1CcVdE4SjNiYAKPJpe/Iq9vb2n8h/eADi50Hx2xUiXiUNZA== Received: from BL1PR13CA0111.namprd13.prod.outlook.com (2603:10b6:208:2b9::26) by SA1PR12MB9245.namprd12.prod.outlook.com (2603:10b6:806:3a7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28; Mon, 11 Nov 2024 06:33:32 +0000 Received: from BN2PEPF000055E0.namprd21.prod.outlook.com (2603:10b6:208:2b9:cafe::bd) by BL1PR13CA0111.outlook.office365.com (2603:10b6:208:2b9::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.12 via Frontend Transport; Mon, 11 Nov 2024 06:33:32 +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 BN2PEPF000055E0.mail.protection.outlook.com (10.167.245.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8182.1 via Frontend Transport; Mon, 11 Nov 2024 06:33:32 +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.1544.4; Sun, 10 Nov 2024 22:33:21 -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.1544.4; Sun, 10 Nov 2024 22:33:19 -0800 From: Xueming Li To: Rakesh Kudurumalla CC: , dpdk stable Subject: patch 'event/cnxk: fix OOP handling in event mode' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:27:27 +0800 Message-ID: <20241111062847.216344-42-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-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: 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: BN2PEPF000055E0:EE_|SA1PR12MB9245:EE_ X-MS-Office365-Filtering-Correlation-Id: 502455c5-ace9-4806-3664-08dd021ac33e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?HxXxLpS0ZO07PNeHtI2jOxlVJurgc31mV34Dxn0fpWiBLS77dsvugCkacetv?= =?us-ascii?Q?pVr65RyLG3kc3Bi0wF4+wX25bk4+QB+SmLtarv6IzlXZVP53RnYysl+or7lD?= =?us-ascii?Q?o4efskj+CR73UcV1zoORSmSbpC8DgdsT6K8i3jF2Em5LCrfl+59SbV9xVkDC?= =?us-ascii?Q?G/TFfeovcYsLW7Lz6ZsxdxELTHQmVbd9fx8VF7brn8kYVKeluGV54o+YFjeJ?= =?us-ascii?Q?2+TGAj0WkBNwAs+bpiZ2J5klOFY2RaenPNQyx8NsZQDHuPVQbH/XFgRpBeQ/?= =?us-ascii?Q?u5cfkCgAgWj4Dfbu+s+Wrni6mZFz/yur77el+8vS/86SUYZompHzSNF+OL8X?= =?us-ascii?Q?X5YE/f6DpAbWIicIHEomNF6DpALzwXIDONdMj39e4kiPy4ZaDaEK9jlgYzOs?= =?us-ascii?Q?DVT/7FIurmR+Dy5enIyYT4Ea95GdYDtxiHlJSIGw0zul1d4WtCfn6wZsut6k?= =?us-ascii?Q?aB9dNBsd8yhhEOyxThW5YvhiOgKUPryb6TZmWyG8gJIGzppVuwffAPjH8ZiO?= =?us-ascii?Q?mwUBFSdHVHlLok2OiXn/8yYt/BUBM1g7wlRmAIg9ajx5aD8PXxehEf05dO3a?= =?us-ascii?Q?jMjnD4egD5Fy3Vyzl9T1AKvJ42lcwvOlReocDNUW3YbkICg69cZrjzO7sOHg?= =?us-ascii?Q?MBlkxEPjacM5+13Y2kXSbUi9y7XT+SRtsQKVrpW+14kVvJvDc8jB5sdPBT0x?= =?us-ascii?Q?dz2zzsjbbezPiPPZQbDhE4vf2YO9fGRwxlcCVeuj3pbjnQHaNCqbUAseP4qq?= =?us-ascii?Q?BZW3xxKpuupkqc/mI8YyUEiwtVWr/jyGlxdDVv/dY53Jy05I/8cVepxF6dW9?= =?us-ascii?Q?068yvgHGNlBAOXn9UZlsYeKZJnju2HFOi2JXWMjfMrfKaiSDUa/v4nk92UG+?= =?us-ascii?Q?il8DnfhWfdTbM9bYC0LczIO0zkfBGEvdsJaDm/ymC/eBDHfen0lWjp98g/gZ?= =?us-ascii?Q?D1UM1+d2ZCmaJw80VGcLrx5HACGUe7pNLOO6ilBq9aeVmfjr9IQpTtz0qzUV?= =?us-ascii?Q?syXPuMqH611hC/lNTO9O9Nz6HlCVk+OZMfWgbxhkqmlG6dq6BwrwNOHysoU/?= =?us-ascii?Q?wcFopZkDRTceFoyCE+pXayiQ9ZCHxnkbuJlTeeDe7fcp8camm3Sv2oMilaFw?= =?us-ascii?Q?R7dg8nWjXDcxiRZ/wJBFbu9iI0srBQ50AbR25NdQ3B03np2WGrip0R4OUBQa?= =?us-ascii?Q?aXZmJAGVYod3YciERJJGxN9zlM+M4nkzRi4LpE1dnLOt7glw6KWRDslp3Ku/?= =?us-ascii?Q?Q8ftHIlMvoyR8R1geMnDX78aE4Oosx/AsQdY29cG/LD83rxEw7Gx04dT5ql/?= =?us-ascii?Q?Y0bdZbhnPfw+wp9d8na3xbQQgAQ89UIFbQYGsc4PXBWqyLYJhwPWPYpu9tB3?= =?us-ascii?Q?Rbu2/Rx4srsuiPinX4iqhRzkDrzPTQpoLAb1lWwxCdUOY/CV6Q=3D=3D?= 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:(13230040)(1800799024)(376014)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:33:32.2486 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 502455c5-ace9-4806-3664-08dd021ac33e 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: BN2PEPF000055E0.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB9245 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 23.11.3 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/30/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=80a61a0a00e593bc6242a9e8f0a210936885c9b3 Thanks. Xueming Li --- >From 80a61a0a00e593bc6242a9e8f0a210936885c9b3 Mon Sep 17 00:00:00 2001 From: Rakesh Kudurumalla Date: Tue, 1 Oct 2024 11:30:55 +0530 Subject: [PATCH] event/cnxk: fix OOP handling in event mode Cc: Xueming Li [ upstream commit 01a990fe40e827c5f3497f785ce7fd68bff8ef5c ] Update event device with NIX_RX_REAS_F to handle out of place processing for SKUs that does not support reassembly as cn10k driver process OOP with NIX_RX_REAS_F enabled. Fixes: 5e9e008d0127 ("net/cnxk: support inline ingress out-of-place session") Signed-off-by: Rakesh Kudurumalla --- drivers/event/cnxk/cn10k_eventdev.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/event/cnxk/cn10k_eventdev.c b/drivers/event/cnxk/cn10k_eventdev.c index 9f1d01f048..a44a33eae8 100644 --- a/drivers/event/cnxk/cn10k_eventdev.c +++ b/drivers/event/cnxk/cn10k_eventdev.c @@ -783,7 +783,7 @@ cn10k_sso_set_priv_mem(const struct rte_eventdev *event_dev, void *lookup_mem) } static void -eventdev_fops_tstamp_update(struct rte_eventdev *event_dev) +eventdev_fops_update(struct rte_eventdev *event_dev) { struct rte_event_fp_ops *fp_op = rte_event_fp_ops + event_dev->data->dev_id; @@ -806,7 +806,20 @@ cn10k_sso_tstamp_hdl_update(uint16_t port_id, uint16_t flags, bool ptp_en) else evdev->tstamp[port_id] = NULL; cn10k_sso_fp_fns_set((struct rte_eventdev *)(uintptr_t)event_dev); - eventdev_fops_tstamp_update(event_dev); + eventdev_fops_update(event_dev); +} + +static void +cn10k_sso_rx_offload_cb(uint16_t port_id, uint64_t flags) +{ + struct rte_eth_dev *dev = &rte_eth_devices[port_id]; + struct cnxk_eth_dev *cnxk_eth_dev = dev->data->dev_private; + struct rte_eventdev *event_dev = cnxk_eth_dev->evdev_priv; + struct cnxk_sso_evdev *evdev = cnxk_sso_pmd_priv(event_dev); + + evdev->rx_offloads |= flags; + cn10k_sso_fp_fns_set((struct rte_eventdev *)(uintptr_t)event_dev); + eventdev_fops_update(event_dev); } static int @@ -1116,6 +1129,7 @@ cn10k_sso_init(struct rte_eventdev *event_dev) return rc; } + cnxk_ethdev_rx_offload_cb_register(cn10k_sso_rx_offload_cb); event_dev->dev_ops = &cn10k_sso_dev_ops; /* For secondary processes, the primary has done all the work */ if (rte_eal_process_type() != RTE_PROC_PRIMARY) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:07.082527300 +0800 +++ 0041-event-cnxk-fix-OOP-handling-in-event-mode.patch 2024-11-11 14:23:05.102192840 +0800 @@ -1 +1 @@ -From 01a990fe40e827c5f3497f785ce7fd68bff8ef5c Mon Sep 17 00:00:00 2001 +From 80a61a0a00e593bc6242a9e8f0a210936885c9b3 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 01a990fe40e827c5f3497f785ce7fd68bff8ef5c ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index c8767a1b2b..531c489172 100644 +index 9f1d01f048..a44a33eae8 100644 @@ -23 +25 @@ -@@ -843,7 +843,7 @@ cn10k_sso_set_priv_mem(const struct rte_eventdev *event_dev, void *lookup_mem) +@@ -783,7 +783,7 @@ cn10k_sso_set_priv_mem(const struct rte_eventdev *event_dev, void *lookup_mem) @@ -32 +34 @@ -@@ -866,7 +866,20 @@ cn10k_sso_tstamp_hdl_update(uint16_t port_id, uint16_t flags, bool ptp_en) +@@ -806,7 +806,20 @@ cn10k_sso_tstamp_hdl_update(uint16_t port_id, uint16_t flags, bool ptp_en) @@ -54 +56 @@ -@@ -1241,6 +1254,7 @@ cn10k_sso_init(struct rte_eventdev *event_dev) +@@ -1116,6 +1129,7 @@ cn10k_sso_init(struct rte_eventdev *event_dev)