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 5684243B86 for ; Tue, 5 Mar 2024 10:54:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5196D4026B; Tue, 5 Mar 2024 10:54:24 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id 5608F42E23 for ; Tue, 5 Mar 2024 10:54:22 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OseP33QdHKXfXpbmKpePF8DixJXPyCHw1vP7yaf3Olfig8eSZEvTQ5GRbxLk6arAFpaeAxS0RJdQW2EVEBtAG2aQZFN4foFF2+yWX1bga/sy6Rccsg/jU8iBTo+lXR3au8znALz7iEWOmXbEi127gB0CunQkK8pn6MrVj8VhiaV/Oz2QTFnhftk9+PMiNwktDfu8ChiMBBpHcJVZBSxWlBT1VlswVUMETS//2L9ytp2tylGj8quVTNq1xHQiVZ//Btt+OkRvigPIS4pJFI2IHZcEokXOjaeQ1CxYMkFoARUhyQOFwsGuI5weENYpB+PKblaaptcb4ORWWysBrvYFMg== 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=YPYyz48mSvAODuR527pc8FBPu/7SDocydr1z+eNMxzs=; b=gHn4drQBYYNR1Pza22hkWnR05liTAZEE2nmxKMi6OOT4fWiM6qUSI+YR3/inPysSt2g/qz1i1A8ZAc8KicohDofqcLSddHlzVncrU4E/Oxa7WQj5zQ27/Vqro/CAs++pE7iGCqlPWqu5VzXzdKxOn1w3JBC8gsKVAJD19PYEYi+Qj7e2Bj0e5OZ23Jk1+A44sXdtqBpjsgvWTqUdM2xtADC6hpWZ+7nVThTkRBmt3bGTxiUIalnK09W6yuke8g39qBJZQt0I0BnEdukGZb8PjnKFEr53Jpfxmpcr0I+d6gLhLjrBgfA2eMkGadgt/g0yv8kdBqrX8fX7tDkDDE/zHw== 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 (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=YPYyz48mSvAODuR527pc8FBPu/7SDocydr1z+eNMxzs=; b=CtWP1jT4T4/5t6Yc9j3UlZeH9oYZCT39hvdgVUx1VDJoOXqd5WlYmkMzTewBkGt+Hxmzt2raRhSFtIoQGZykuiR/RzPCcXgwrqw97Ac+j5AlrXamT/bvuTEDQ/80wsAdtfgi6t4glFkVjh8ISxSIlndtSfgbk5ElEbXzpbj+ZXUqqkesUZ/nPjbLcn+kaoZorvjuYVltaBGNdFXIRZ9OvKq1VXcH775j+ZgiwiHQrL7Rwp+vHvsmwZq13NBJjiWfiKPGILJ90xBJXf70odOH2dUji5U+BEt6KVW60VBbckEsNZLdYV2xAi2ZHT7apPFhmAN5oQnXvlXhlQhvobFArg== Received: from BYAPR21CA0021.namprd21.prod.outlook.com (2603:10b6:a03:114::31) by SA1PR12MB5669.namprd12.prod.outlook.com (2603:10b6:806:237::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.37; Tue, 5 Mar 2024 09:54:19 +0000 Received: from SJ5PEPF000001D1.namprd05.prod.outlook.com (2603:10b6:a03:114:cafe::74) by BYAPR21CA0021.outlook.office365.com (2603:10b6:a03:114::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.4 via Frontend Transport; Tue, 5 Mar 2024 09:54:19 +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 SJ5PEPF000001D1.mail.protection.outlook.com (10.167.242.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:54:19 +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; Tue, 5 Mar 2024 01:54:06 -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.1258.12; Tue, 5 Mar 2024 01:54:05 -0800 From: Xueming Li To: Pavan Nikhilesh CC: dpdk stable Subject: patch 'event/cnxk: fix dequeue timeout configuration' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:50 +0800 Message-ID: <20240305094757.439387-70-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-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: SJ5PEPF000001D1:EE_|SA1PR12MB5669:EE_ X-MS-Office365-Filtering-Correlation-Id: 682273cd-fdc8-4505-7f5b-08dc3cfa3a1f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +FBCS1sPLzF8vvuNihOL7ctZlGw6EPNwfR6ChpHSg085yAaa6CqNJOoVOfsuSi2YH+O4Ij8SmFf5knB1Y+WCL5xJwHGWersjCcZCXKoGUuvDGgdTh6Xx8sZgduB08LTx2ZzCVNBPRQHggm7NRJcHm4lvWs1bPbdPBp3qDz2ut+d/ZHv528OYiYbglYuK1IXdBfLKM+WsLTbT7Exe4vEtduvvQUnuSbH4AQGEPJSpiohvOOGIGCI5OYw582TzsIoDYsuxmApFO8udxd9PPztcoOIfIO17ZpfAcxw55Tpx/Fs8j8UbYKOfKYjqSxY58VN8VQuvCl0ptlUPKKMiOWKNbekrIJ/BmMNIVHRJ1phP3m8tpUy8k36WdBJoXlVHLBWie4XUwZ5SgSfxgt5TZUibeP7W/x3/moaNNtKvuYxec9bL+pHjJT/pFA3mFERzzUC7bh01GERQ7mHD/NUqnzcFvU2QAbqQWWduUmIR2feVBdora4DV9WIe57RcQh53sCmgb5AXqtBBB8Ib9Wcoor8IILKUEXOVe5pFOl2rlJIRUO2QIN7GdMgR/BbL2nTheDP6j7aXkZdqBhuIEHk4UCHKrfhyTnfIvIGNPIYhg4KCDTICQ8KOd5MEUJ/dHFX2FiEDTJ1KK4KGwAeOecom8F8hGtinffUskEp6AJ94EVBCbgn8kxnyiW0fu4qFZ1bnSFVIgjKoNyh/7h3KG3GsahAc+VH5mFQLhqvOB6DylLOKRTaPnm6jntwQ4euxAtlHMr6g 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)(36860700004)(82310400014)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:54:19.4088 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 682273cd-fdc8-4505-7f5b-08dc3cfa3a1f 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: SJ5PEPF000001D1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB5669 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.1 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/31/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=6ccd84cf1692d9fdc800078696afb99219946ed9 Thanks. Xueming Li --- >From 6ccd84cf1692d9fdc800078696afb99219946ed9 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Thu, 7 Dec 2023 12:25:39 +0530 Subject: [PATCH] event/cnxk: fix dequeue timeout configuration Cc: Xueming Li [ upstream commit efcf81e1a89fa7b20aae17accfcb4a8e7ddc3d02 ] Allow dequeue timeout to be configured as zero, when RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT is disabled. Fixes: 5512c7de85cd ("event/cnxk: add common configuration validation") Signed-off-by: Pavan Nikhilesh --- drivers/event/cnxk/cnxk_eventdev.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c index 1ec281e735..20f7f0d6df 100644 --- a/drivers/event/cnxk/cnxk_eventdev.c +++ b/drivers/event/cnxk/cnxk_eventdev.c @@ -162,16 +162,17 @@ cnxk_sso_dev_validate(const struct rte_eventdev *event_dev, uint32_t deq_depth, deq_tmo_ns = conf->dequeue_timeout_ns; - if (deq_tmo_ns == 0) - deq_tmo_ns = dev->min_dequeue_timeout_ns; - if (deq_tmo_ns < dev->min_dequeue_timeout_ns || - deq_tmo_ns > dev->max_dequeue_timeout_ns) { + if (deq_tmo_ns && (deq_tmo_ns < dev->min_dequeue_timeout_ns || + deq_tmo_ns > dev->max_dequeue_timeout_ns)) { plt_err("Unsupported dequeue timeout requested"); return -EINVAL; } - if (conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT) + if (conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT) { + if (deq_tmo_ns == 0) + deq_tmo_ns = dev->min_dequeue_timeout_ns; dev->is_timeout_deq = 1; + } dev->deq_tmo_ns = deq_tmo_ns; @@ -666,7 +667,7 @@ cnxk_sso_init(struct rte_eventdev *event_dev) } dev->is_timeout_deq = 0; - dev->min_dequeue_timeout_ns = 0; + dev->min_dequeue_timeout_ns = USEC2NSEC(1); dev->max_dequeue_timeout_ns = USEC2NSEC(0x3FF); dev->max_num_events = -1; dev->nb_event_queues = 0; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:33.012799767 +0800 +++ 0069-event-cnxk-fix-dequeue-timeout-configuration.patch 2024-03-05 17:39:30.793566494 +0800 @@ -1 +1 @@ -From efcf81e1a89fa7b20aae17accfcb4a8e7ddc3d02 Mon Sep 17 00:00:00 2001 +From 6ccd84cf1692d9fdc800078696afb99219946ed9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit efcf81e1a89fa7b20aae17accfcb4a8e7ddc3d02 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org