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 6A5D843E57 for ; Sat, 13 Apr 2024 14:56:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 65B2D40E09; Sat, 13 Apr 2024 14:56:57 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2085.outbound.protection.outlook.com [40.107.102.85]) by mails.dpdk.org (Postfix) with ESMTP id 41F22402CB for ; Sat, 13 Apr 2024 14:56:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YKsGcgpirt8MDQT0biTJFxiE+spB+ayRDOvYd5fIYYP0iwWsSaum1j36mwj4Q+mN9fgZk8N6OLf4EONkvb8+KVfMzX9IVEpGCQxborVp4vytlgajrClzJsBZZ9SUL3V7TTm+dJ2Xjp6K58WpcRKRzrpihcLM7uSPUOVWqKwtQfGDvHFWzSyo5+Ka/OYGsuhvxSBK5vrfSten3X/EfVs4cwG8xFrnDtHTamabNUBwRXkJ8ynwCSAs/WK7Q5+XfMVyeTgLc+iPLJxC18rBLtMnKz4xNz+ndqxNgOCmas7+YxTje7Fo0FQLDTdTblkmCV0CB015r2aNitaIYBr97jm3zA== 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=3z4EN3Xa7sEcEJMXT+Yj23vVIiSCw4g8gk7APZiDSzU=; b=WlQKthZNhS21ictUUE8Y24I9Bklo8zAliqLB31yf8ipronEZAM4O2OqlvkmyfrRbq9c5gkhep90fZm7ZdP/oDWxo0UJI2gyv5W679Q6ZdlyhMPpbvn6mvAjummympnKDATtcZfmW4fhcLVhuPCcfu7/1L9cz04MjRcvt+r8Ocgz1YqrCINg5DSrADzru7umaHJSB/b5fqOILKCEdJu+3C9G5mOhBAWlNuiqYLrVi4e8e/LM/3TIs9M7YF/HdZGdZ5LOO9mEb5hi8oVzrTdVmZ/0wHW9T35nJ4HuAAN13Ph8jdlRvPMkdjpmENs0eH/7m9NArnPHWaTbTTOm12Hs0Pw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=cesnet.cz 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=3z4EN3Xa7sEcEJMXT+Yj23vVIiSCw4g8gk7APZiDSzU=; b=QFmdOtfd1emwf7LXgGmcFfS/Pp95vEM0lN+WVtA+YprWOHnpr0HxP6S7bHe7AjRQvOuXZI1W9mkGCpvi11ZdpKcAxW7W9la2x9pOxPgua8slYF7mu3vw64/y8+zPytfhMk9PdKbTa1FhQ80Ftk+TDAylrk5x6kSVckHIAgo2c6/Vb8ZvdIXpfvyr2V/0OLMMjdKRSJbQ/f/VWW2moClzBP2t2JCyRI1/zcVXF+GX32Uu+jGUYWXsQsAg/FszbABEh7YzKdDnZNsCPuN2LeZgHBTx5M/kKoBI4VyYLntH5rKLBBy3ATFo0oJrUxN0ovFrhDYD769DjX9AwuI1Z5p8sA== Received: from DS7PR03CA0136.namprd03.prod.outlook.com (2603:10b6:5:3b4::21) by SJ2PR12MB9238.namprd12.prod.outlook.com (2603:10b6:a03:55d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 12:56:53 +0000 Received: from DS3PEPF0000C37C.namprd04.prod.outlook.com (2603:10b6:5:3b4:cafe::97) by DS7PR03CA0136.outlook.office365.com (2603:10b6:5:3b4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.22 via Frontend Transport; Sat, 13 Apr 2024 12:56:53 +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 DS3PEPF0000C37C.mail.protection.outlook.com (10.167.23.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:56:53 +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; Sat, 13 Apr 2024 05:56:41 -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.1258.12; Sat, 13 Apr 2024 05:56:39 -0700 From: Xueming Li To: Kamil Vojanec CC: Konstantin Ananyev , Kevin Traynor , dpdk stable Subject: patch 'examples/l3fwd: fix Rx queue configuration' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:12 +0800 Message-ID: <20240413125005.725659-72-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-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: DS3PEPF0000C37C:EE_|SJ2PR12MB9238:EE_ X-MS-Office365-Filtering-Correlation-Id: 15cf8893-aee4-4ded-8955-08dc5bb93135 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 55dBACpXp34lz+Vo9L2mly9PNPpmihmz54FkGCjR848TekT6X2sc7EAmnqLenY8sjEboXrc1x0B5tt0k10qEZuDfaOzifBzzVjSPETsCE3rCIolcBnIQ0gtYuVJtHXjwtSPFBhaK3fQJ+QNhPtV+d5JUkQHBHYZSNlZ376vyxHFjlI24PVTm/nze+jd2v9BrVTb16TV29uX43CLgr2WxW3BH7OCQhH7eqHAbZApkCaxUWrK8YiwYoBUgrppjsrNUczVcV7pqBfCYal/WKN5bg5CikzGuBr03O0vj5sVI33fwgUFsEt/Gtwcz24FKl5R5Xf0gCIBqkKWgArRnt18EsdpaLBV7GOXZGlgdwAqTRG/Kl1aB1mkTmJYGFbS9OwUo1y0YZ0pWWhh6w3p5OG933hn5qXlmZbB4PpFcSYGAoc9m1nHfpSIVFatwDUpsyAhyVBLhC7tWIiecjBbr/hBy8c/I8wt2nXqvvZI/c8ut38F+YWyoOsXDNRMTt062sItLn+dPMlZRWwBr+QKpzkuMG6BJDqdJou5+J4+fejn2Q/AYa7xZgLgoYTDBYo81F/5ABq5ahqgHrP3Zk4YbGUwfpEu6Gl6Hq0qhvRFjxpySmUeQ4VHJ0V9qeakwW8yt8H/+VvqVRztFMoPteOfry/s+Mup0jMhnJsmjBACNdl8QZ+1nu01NBbV5JwDfidJIzoETwGjejUBCZ3ftzV2kokzKvxtPZDl+YkmeWmlA5trbuPLNLerAswh7/ypRY/USA3k0 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)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:56:53.1031 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 15cf8893-aee4-4ded-8955-08dc5bb93135 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: DS3PEPF0000C37C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB9238 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 04/15/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=587143897e3f081134d895adb59526e748d8e7f6 Thanks. Xueming Li --- >From 587143897e3f081134d895adb59526e748d8e7f6 Mon Sep 17 00:00:00 2001 From: Kamil Vojanec Date: Fri, 16 Feb 2024 13:02:07 +0100 Subject: [PATCH] examples/l3fwd: fix Rx queue configuration Cc: Xueming Li [ upstream commit 7015f232adf0e1622822660afc70055bf359bd7a ] When configuring Rx queues, the default port configuration was used, even though it was modified before. This results in the 'relax-rx-offload' not being respected for Rx queues. This commit uses 'rte_eth_dev_conf_get()' to obtain the device configuration structure instead. Fixes: 4b01cabfb09b ("examples/l3fwd: add option to relax Rx offload") Signed-off-by: Kamil Vojanec Acked-by: Konstantin Ananyev Acked-by: Kevin Traynor --- .mailmap | 2 +- examples/l3fwd/main.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index f76fef1c48..debb7beb5f 100644 --- a/.mailmap +++ b/.mailmap @@ -723,7 +723,7 @@ Kamalakshitha Aligeri Kamil Bednarczyk Kamil Chalupnik Kamil Rytarowski -Kamil Vojanec +Kamil Vojanec Kanaka Durga Kotamarthy Karen Kelly Karen Sornek diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index d4fb5d1971..8d32ae1dd5 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -1388,6 +1388,7 @@ l3fwd_poll_resource_setup(void) fflush(stdout); /* init RX queues */ for(queue = 0; queue < qconf->n_rx_queue; ++queue) { + struct rte_eth_conf local_conf; struct rte_eth_rxconf rxq_conf; portid = qconf->rx_queue_list[queue].port_id; @@ -1408,8 +1409,14 @@ l3fwd_poll_resource_setup(void) "Error during getting device (port %u) info: %s\n", portid, strerror(-ret)); + ret = rte_eth_dev_conf_get(portid, &local_conf); + if (ret != 0) + rte_exit(EXIT_FAILURE, + "Error during getting device (port %u) configuration: %s\n", + portid, strerror(-ret)); + rxq_conf = dev_info.default_rxconf; - rxq_conf.offloads = port_conf.rxmode.offloads; + rxq_conf.offloads = local_conf.rxmode.offloads; if (!per_port_pool) ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd, socketid, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:07.229162617 +0800 +++ 0072-examples-l3fwd-fix-Rx-queue-configuration.patch 2024-04-13 20:43:05.017753905 +0800 @@ -1 +1 @@ -From 7015f232adf0e1622822660afc70055bf359bd7a Mon Sep 17 00:00:00 2001 +From 587143897e3f081134d895adb59526e748d8e7f6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7015f232adf0e1622822660afc70055bf359bd7a ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 68b4cae8d3..66ebc20666 100644 +index f76fef1c48..debb7beb5f 100644 @@ -27 +29 @@ -@@ -728,7 +728,7 @@ Kamalakshitha Aligeri +@@ -723,7 +723,7 @@ Kamalakshitha Aligeri