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 CA7C6457A1 for ; Mon, 12 Aug 2024 14:55:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5384402C3; Mon, 12 Aug 2024 14:55:29 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2064.outbound.protection.outlook.com [40.107.243.64]) by mails.dpdk.org (Postfix) with ESMTP id 9AD5540668 for ; Mon, 12 Aug 2024 14:55:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EueHiotnatNVjc6qM9/dVYLJr3LzQNkquve8AqcsyRyURyBTGtfPYGyiSHsR46UCp80SMRe638vq2Dw0/4CELSwiZq9L9MycsWgogNu/9B8n/YEUwZCWQmBFv0cwPgaT/8rx0sjz6rYK4Xia9/nRhsztOzhVPuPmqg/rO5TpFh3ILO1XnmZiUdK/QlfNnppEl0WE5/FGhe57419QjyMdDhH71BbLT+SZbiEbht9VTaETZRVH+jYvRd5jbt9bVLXL/X8xO+i3mQZk1u5AoI4raMSKeSWz6nXlOPGXZMx/yZCgJWsmn35CrmeNBI1syHkJsr32Xv0XVZgxhZrAdS5qTQ== 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=Nq8os2ySZPzIi5LZhOYIqIaOU72ZgT3ag+3D+4O973g=; b=nGceuVfG/atUIO18llSbFXDrG0RG0jPtOwxSM/vv8UUgWlEx4AguQecZ2UUYn0nusQHcLiUyEKNxnf9QI154KaItqXRATgc1zLKR6zH8BNcTguHcpvAKm7HPUVSvamP1zO6ktHV9vGuI+/uuaz7l5/Hr2HYzqvMWvQ7MUd0J/JuGlPLwDIFnuUZ47pFpMcphWbSilwGhPgrUeZ0yxPlShCpJ8qTr5Dvpj5k7Wxj/qwLIViZPSi7ol1Z9o6Br1QE0huGb0Wp2otqsVkuxmA3z2sg2gI6UYGCpTg3OzGUY5cOqstFZ+2bbgHUmNq4PiKXPTribGyhvkguFyg/7v1OLdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=nxp.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=Nq8os2ySZPzIi5LZhOYIqIaOU72ZgT3ag+3D+4O973g=; b=tjP9FoZPVLMD3tdlgLkUkXV7+Rlk5ARjbmYeqXlJw7Vibatl8BVQdZWhXNiS5tPM+4JpP4TSaSaFGFHpf/F1o99VfBomuLnhevFG1K+OpXJoI5+rzyjAuvpE91xUPK/1BzQxTEu4l8VI9jwe2DUgfifdf74odBi+qM7wi9XOw+VNZWOtR5yHrVZ8zhzQ8Z2qfMv5QGQJMNFJMw6/ygF7XZ1HyesaeXD+YaJq7rPcaQFM1W5mGS3BZcz3WTXtRHByMw7WNUxd+jphMOuAugVRFbDJhSMgZY32QYgE6OOmuu35HvDwX4ZHokau23xXqBl9A6niW5+pbcFadEi3PO1iRg== Received: from DM6PR06CA0102.namprd06.prod.outlook.com (2603:10b6:5:336::35) by SA1PR12MB6871.namprd12.prod.outlook.com (2603:10b6:806:25f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:55:25 +0000 Received: from DS1PEPF00017090.namprd03.prod.outlook.com (2603:10b6:5:336:cafe::27) by DM6PR06CA0102.outlook.office365.com (2603:10b6:5:336::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20 via Frontend Transport; Mon, 12 Aug 2024 12:55:25 +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 DS1PEPF00017090.mail.protection.outlook.com (10.167.17.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:55:25 +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; Mon, 12 Aug 2024 05:55:16 -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.1544.4; Mon, 12 Aug 2024 05:55:14 -0700 From: Xueming Li To: Rohit Raj CC: , Vanshika Shukla , "dpdk stable" Subject: patch 'net/dpaa: forbid MTU configuration for shared interface' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:44 +0800 Message-ID: <20240812125035.389667-48-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: DS1PEPF00017090:EE_|SA1PR12MB6871:EE_ X-MS-Office365-Filtering-Correlation-Id: 13ddb9bd-c2bb-4624-30bd-08dcbace08c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?kItWQdM0k9s9s3bE+56Ffnpsn9Bt8on0bq46RYNz3lbr2JLz1rw1M4yajttD?= =?us-ascii?Q?QF/u/zimnoulcbW16fO4NVjaVJ4Sw5YsqMnd4xx4nggiBFntDizfuJYt8Tzj?= =?us-ascii?Q?eucIGkONmb1bbKQ7jxwOjOlLgKrdL+ycwjzPJrlyS4dg0AAtlTZ2VEz0P4f2?= =?us-ascii?Q?aaYm9Zk2+VVDxF6aDclj/GuxQ+QAy9n6f40NGnjU5fvkuiJPZOxdr/VCVEbZ?= =?us-ascii?Q?HBxUjn9cClnHiDiyJOFXtfjADgBBPs/nGnYwa1yI7dV29+vrn6C8ropHVjX1?= =?us-ascii?Q?Ti43ORBazZVRqDfDMy6g9GS8u1GDXd/KnOZrD7KTh8dJl7bO38kFIbBIovzX?= =?us-ascii?Q?ePd+orl3hzW/eNS38q0pygWLZOOFCLHB1Yf1jlLmAHzwgnrWkpScw2T7qE/A?= =?us-ascii?Q?IoEeowATP7WryrZmPG89EPkIGiHWr8GajsXooJdUrpwpYQ/6g9heuO+hhfVC?= =?us-ascii?Q?qg2ytwAa7gOvT6yy9n9VrhDHqq8wEvoFu7rAn4FNnBcbKMpbvZevRsUJhq3c?= =?us-ascii?Q?iewF0KDiWk9b+CsWO1QHFWwiTFg6S61+1KNWMocZvt9TRUzIbEjBUUoIM+z6?= =?us-ascii?Q?yRPe8UuaMQUcMYzz1aMRHZmgdajI2Wpq/Zgtu4SuXH8uhkljdZxTIlWPc43/?= =?us-ascii?Q?A4JkDEog1VfhAGlEZizakutn/SEObyLnuy7Aj3Cdq/KpUPOygGQ5m8UIJXfk?= =?us-ascii?Q?3qlhsEsmcJDRCnxiDnWLYst5obemYzXT1AEEWvfEJfOs6UCqwBwSjbD61p9T?= =?us-ascii?Q?EGYRYimtIrvNXJz7t5ejL3GWn4zE4H0yyBVmbQIX0h5BZcVIFJ4wLPizvC5+?= =?us-ascii?Q?lE2+aSkLZ8tw1UzmvDc6TWRI2va6e7prWgavSKkUdJV79whsfCAWRcghLyHd?= =?us-ascii?Q?eulK1iwHlLdkVdiBuYRjwnAPypUl3kZHYGHHAUmV8V3sYkeU6z8P0Wqqh5Hk?= =?us-ascii?Q?JSWj5NorzaoJ8O3ABJjqMiHPndf8w+wwUahzwm+5IagbS37adxRj7aM885hM?= =?us-ascii?Q?orLO/uCNoq23J4H2XvkU15mtGAJu9mL7ZABxfDQWjIU+PqqYlE0S3hGSTU8v?= =?us-ascii?Q?HRWJ5MEySefwaQ+vT8KtNm+AqwYzjUXLyRmCzmrjkXr6ZbprKliNOfh9SgFT?= =?us-ascii?Q?0/ynNvBkFmvYyECr/2U8gGqtf+PAXwDVWG/7XyMmnrKx7JOI0FaFITsjXvE4?= =?us-ascii?Q?qOkXIbJpnvtW33o67AwPS/QFGTUw3UPZeAVbW5FByCUFZR2uQA4KdLwCbpgo?= =?us-ascii?Q?InamW/f2K6XPyOufypjDvfFQ2wuvi5kPhdWn1kpzZ2OT9C2i+oWdBAdY98B5?= =?us-ascii?Q?rE2utpHXSlEE4wSiOkyVjjpngc47p1soHzPPkj0znySkB6uLGfCJk+7IC8HR?= =?us-ascii?Q?RxfUl7JJyt3YuJvPlNwNcIPhgpAEMzxMalnJLEYys9U0tvZcFWVFATkRcomr?= =?us-ascii?Q?pd9sVArj5qOs5680Y9HuyOgcsdc2LUDU?= 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)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:55:25.1506 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 13ddb9bd-c2bb-4624-30bd-08dcbace08c7 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: DS1PEPF00017090.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6871 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.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 08/14/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=77231b25980ef996ed140b6651826fbeff283104 Thanks. Xueming Li --- >From 77231b25980ef996ed140b6651826fbeff283104 Mon Sep 17 00:00:00 2001 From: Rohit Raj Date: Wed, 10 Jul 2024 14:25:33 +0530 Subject: [PATCH] net/dpaa: forbid MTU configuration for shared interface Cc: Xueming Li [ upstream commit ee0fa7552a0af02e2151414aeec2ce4e12a2e806 ] Since DPDK was able to configure mtu in VSP/Shared interface mode, it was causing misconfiguration of the hw which further caused crashes. This patch allows only kernel to config MTU in such cases. Fixes: e4abd4ff183c ("net/dpaa: support virtual storage profile") Signed-off-by: Rohit Raj Signed-off-by: Vanshika Shukla --- drivers/net/dpaa/dpaa_ethdev.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 779bdc5860..bcb28f33ee 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -165,9 +166,15 @@ dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) uint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + VLAN_TAG_SIZE; uint32_t buffsz = dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM; + struct fman_if *fif = dev->process_private; PMD_INIT_FUNC_TRACE(); + if (fif->is_shared_mac) { + DPAA_PMD_ERR("Cannot configure mtu from DPDK in VSP mode."); + return -ENOTSUP; + } + /* * Refuse mtu that requires the support of scattered packets * when this feature has not been enabled before. @@ -206,7 +213,8 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev) struct rte_intr_handle *intr_handle; uint32_t max_rx_pktlen; int speed, duplex; - int ret, rx_status; + int ret, rx_status, socket_fd; + struct ifreq ifr; PMD_INIT_FUNC_TRACE(); @@ -222,6 +230,26 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev) dpaa_intf->name); return -EHOSTDOWN; } + + socket_fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP); + if (socket_fd == -1) { + DPAA_PMD_ERR("Cannot open IF socket"); + return -errno; + } + + strncpy(ifr.ifr_name, dpaa_intf->name, IFNAMSIZ - 1); + + if (ioctl(socket_fd, SIOCGIFMTU, &ifr) < 0) { + DPAA_PMD_ERR("Cannot get interface mtu"); + close(socket_fd); + return -errno; + } + + close(socket_fd); + DPAA_PMD_INFO("Using kernel configured mtu size(%u)", + ifr.ifr_mtu); + + eth_conf->rxmode.mtu = ifr.ifr_mtu; } /* Rx offloads which are enabled by default */ @@ -249,7 +277,8 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev) max_rx_pktlen = DPAA_MAX_RX_PKT_LEN; } - fman_if_set_maxfrm(dev->process_private, max_rx_pktlen); + if (!fif->is_shared_mac) + fman_if_set_maxfrm(dev->process_private, max_rx_pktlen); if (rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER) { DPAA_PMD_DEBUG("enabling scatter mode"); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:04.095906474 +0800 +++ 0047-net-dpaa-forbid-MTU-configuration-for-shared-interfa.patch 2024-08-12 20:44:02.025069281 +0800 @@ -1 +1 @@ -From ee0fa7552a0af02e2151414aeec2ce4e12a2e806 Mon Sep 17 00:00:00 2001 +From 77231b25980ef996ed140b6651826fbeff283104 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ee0fa7552a0af02e2151414aeec2ce4e12a2e806 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 44bac67803..060b8c678f 100644 +index 779bdc5860..bcb28f33ee 100644