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 17FF7428F8 for ; Sun, 9 Apr 2023 17:30:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 127F340A80; Sun, 9 Apr 2023 17:30:24 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2045.outbound.protection.outlook.com [40.107.92.45]) by mails.dpdk.org (Postfix) with ESMTP id 2FD67406B8 for ; Sun, 9 Apr 2023 17:30:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gpiCAqdjJf3ee1B/GpNdPIrJo3UChyJL2wjwE1C/UVfDrkNkCUIc5l/GVdHwfvN6nh0g/Y3RzsYRzSU6Me8I+8/1zI3Fem8JWg7+nGPWMbCX0BZzsjJhJ7Api2/oEV0dCU1UIYYM8gHfMmBYStb/li4LsFZn8C8V0VT5ZlXP/4wOufqBzOwlTCsubvCejIateJkBMT/8vipihMbEkGE2sKkulwslUmdtybi8juWHivYsDkJjC9JAlZLGwJ3Q6zqwd4qpPN36h8MCvhZazD+CmwsPHQPR9s/CKXv66MY848cWbNHn0h/NNkxIHWLophbVXkXjWzTjqv7kxidLJIZn4A== 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=+/bkEToVszfXiSGqmtsSLLwHUgyBx/8oqKruUKEKonE=; b=U0Pj3d/D096dmsjSLa+RZRAKl9/O86iE4jcEr0sFAWdT4+bBJyzJA6UVGf81DWlyNkS87oBiYr2RvOVAOVxf/gI71j4aDhex6Z0/HuAkKLQx1YZ0LGBYmUyqhEfWQqilu1y8QAVejhkhfVmlM6D7sTT8eu/WIEi3fskjBitbr4QW95G5YFP8viPXp+ipf4gPHCAEHFQM/ZIMkBTqVCKBB/Rz7V+j+QzsFaj9oc/pVTtp2ZwnZJ9enh7cImQN0YwL1jPjZABw0YcuFVmr9pv7kGFD+i+o9HzYdhwYwFaywfxs0nTxbkDYMsuh5T83Pbde1j1hmVzx6egh8b6TGJovMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.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=+/bkEToVszfXiSGqmtsSLLwHUgyBx/8oqKruUKEKonE=; b=OFqqwmZvfJ2ubRq7apSQaGn5k7QNjmBFKLTdZPKd65tABycnUtJamajrhmtHCHnz1FzSYdKDcorvJGjTR3Wg1U4e9QD1Sus+Z8hAHWlY5tSWc1D2KOmo8JvYYhkvcYtPl02WKP+a4ApH6AKlhGki288sCglZ/l0RdiCMYxUGYW9HR8K1979jjkugFcj+J5K3lhiZke5VOYp8JyqIxdiIQMUz69rz69XTUGphANubbd/r2/Ha6ogJc27SS3NSDCxB+lN4taP3GNA/dCvN0Idz+x7BhHpZwFuApLNMapcsxSdqw3wZK/IZjXDLFUC2fL42nFIGAe/lQTnkmnxPtxLRQg== Received: from BN8PR04CA0003.namprd04.prod.outlook.com (2603:10b6:408:70::16) by DS0PR12MB6559.namprd12.prod.outlook.com (2603:10b6:8:d1::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Sun, 9 Apr 2023 15:30:20 +0000 Received: from BN8NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:408:70:cafe::2c) by BN8PR04CA0003.outlook.office365.com (2603:10b6:408:70::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:30:20 +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 BN8NAM11FT005.mail.protection.outlook.com (10.13.176.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.24 via Frontend Transport; Sun, 9 Apr 2023 15:30:20 +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.5; Sun, 9 Apr 2023 08:30:07 -0700 Received: from nvidia.com (10.126.231.37) 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.37; Sun, 9 Apr 2023 08:30:05 -0700 From: Xueming Li To: Peng Zhang CC: Chaoyong He , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix MTU configuration order' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:24:02 +0800 Message-ID: <20230409152529.5308-55-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT005:EE_|DS0PR12MB6559:EE_ X-MS-Office365-Filtering-Correlation-Id: 2456a29b-928a-49a2-da47-08db390f543a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3OEcugrdp8IHw6Vli4d66BBUso4U4HnXumi/jYoGMHP8bExXpv3QRHuOVzx5xa2zn3gUqPk6Q7AbitowvtOWOimMPmIIhnKrvbapLXxeVNvaEBtRwyQmVIhJ+jydh+Yu8yKU44qDfTfTbehDS71pTCyDJKkJhyPIHFuVzPhrHy0jPiPWgI5WZCVd+kogfXwtvRlbfQTChUY8EUR+ECPs6CK7m7qF4XU4AOG+TX4md7/bUCFNK47IYwFxkoW+R8CPFZuKQfM11FtiBGywWrrf9XOCB/mbg7P5Gb5t56+KWkIc7LFkDWaMLe5tqepdboRBwckk5mE/lrmT6d3k+1+TN5OPBxI8rfSaJ8XhQhkLkdqVk1jpPSXg2+EWPPN7/mFcbLqfvLrw/9rujLT5puvrxRM9dhuPB+NE6laupTdlI/gsD7T62tQ9olXHcYnOy5vl0PpZiJ4dCTxGWQTu85dgpxOGhh/h0ahrXuXCxIYAIzb89e58kV8LMbCv+SL10yv8N0C9c4sEKzCXQaxK1n8lBFC7ZPE8yV65g1+lOGzCoPPnbtEHpwZptdC/QFXIvWw9qIkaSLbh04iOO07KAEeeuQTYnhabeFkrSj4Gwsoy06jmBjDUbfTlMJn4fH8ZodOzU1S8CcMvGkyAsXkrkDPrkInMaB3q6OOG6m+1TrNqgA3HSyl+AXMdfv3WRrSrtzEqoNX4SXmxE+4L8MjUz3FpmDmzO/XheKCVuGijUTEIT7JkI0xWqa6zu+2xJOrdgl7So58gir3L/2gsmGExhQujWJ1PXa0pwVlNrLcjMBverxXJ20HCjBiRdqbCwnxsDZ0+VQDgiUP+rUnXcci7vLqgxA== 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:(13230028)(4636009)(39860400002)(396003)(376002)(136003)(346002)(451199021)(46966006)(40470700004)(36840700001)(55016003)(40480700001)(40460700003)(70586007)(70206006)(6916009)(4326008)(478600001)(316002)(54906003)(5660300002)(41300700001)(356005)(7636003)(82740400003)(8936002)(8676002)(36860700001)(53546011)(16526019)(6286002)(186003)(47076005)(66574015)(426003)(336012)(83380400001)(2616005)(7696005)(6666004)(1076003)(26005)(966005)(86362001)(36756003)(82310400005)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:30:20.1305 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2456a29b-928a-49a2-da47-08db390f543a 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: BN8NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6559 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.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 04/11/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/log/?h=22.11-staging/commit/bb296faffc9f2cf9d068709aa9683047c32d082d Thanks. Xueming Li --- >From bb296faffc9f2cf9d068709aa9683047c32d082d Mon Sep 17 00:00:00 2001 From: Peng Zhang Date: Wed, 8 Mar 2023 10:33:18 +0800 Subject: [PATCH] net/nfp: fix MTU configuration order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 4352a3bcee3a4cc20c8accb71d683d5add3c6f80 ] If rte_eth_dev_set_mtu() is called before rte_eth_rx_queue_setup() the NFP driver setup fails. This is because the default values evaluated when setting the MTU are initialized in the rte_eth_rx_queue_setup() code path. Fix this by instead initializing the MTU default values in the device initialization, in nfp_net_init() and the check also is conducted in nfp_net_start(), so it doesn't influence the result. This was found by using DPDK with OVS. Fixes: dbad6f64f921 ("net/nfp: fix internal buffer size and MTU check") Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 1 - drivers/net/nfp/nfp_common.c | 4 ++-- drivers/net/nfp/nfp_common.h | 1 + drivers/net/nfp/nfp_ethdev.c | 1 + drivers/net/nfp/nfp_ethdev_vf.c | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 6857732028..9c237bdb72 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -25,7 +25,6 @@ #include "nfp_flower_cmsg.h" #define CTRL_VNIC_NB_DESC 512 -#define DEFAULT_FLBUF_SIZE 9216 static void nfp_pf_repr_enable_queues(struct rte_eth_dev *dev) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index c9eeaa02fc..b673370f20 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -977,9 +977,9 @@ nfp_net_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) return -EBUSY; } - /* MTU larger then current mbufsize not supported */ + /* MTU larger than current mbufsize not supported */ if (mtu > hw->flbufsz) { - PMD_DRV_LOG(ERR, "MTU (%u) larger then current mbufsize (%u) not supported", + PMD_DRV_LOG(ERR, "MTU (%u) larger than current mbufsize (%u) not supported", mtu, hw->flbufsz); return -ERANGE; } diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index 8cf99c0eae..67c8dc33d8 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_common.h @@ -111,6 +111,7 @@ struct nfp_net_adapter; /* Maximum supported NFP frame size (MTU + layer 2 headers) */ #define NFP_FRAME_SIZE_MAX 10048 +#define DEFAULT_FLBUF_SIZE 9216 #include #include diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index cf7a4389b3..dc63b05bd6 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -604,6 +604,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) hw->cap = nn_cfg_readl(hw, NFP_NET_CFG_CAP); hw->max_mtu = nn_cfg_readl(hw, NFP_NET_CFG_MAX_MTU); hw->mtu = RTE_ETHER_MTU; + hw->flbufsz = DEFAULT_FLBUF_SIZE; /* VLAN insertion is incompatible with LSOv2 */ if (hw->cap & NFP_NET_CFG_CTRL_LSO2) diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 865cac7741..1877d6b76b 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -361,6 +361,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) hw->cap = nn_cfg_readl(hw, NFP_NET_CFG_CAP); hw->max_mtu = nn_cfg_readl(hw, NFP_NET_CFG_MAX_MTU); hw->mtu = RTE_ETHER_MTU; + hw->flbufsz = DEFAULT_FLBUF_SIZE; /* VLAN insertion is incompatible with LSOv2 */ if (hw->cap & NFP_NET_CFG_CTRL_LSO2) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:40.180394400 +0800 +++ 0054-net-nfp-fix-MTU-configuration-order.patch 2023-04-09 21:45:38.669042200 +0800 @@ -1 +1 @@ -From 4352a3bcee3a4cc20c8accb71d683d5add3c6f80 Mon Sep 17 00:00:00 2001 +From bb296faffc9f2cf9d068709aa9683047c32d082d Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 4352a3bcee3a4cc20c8accb71d683d5add3c6f80 ] @@ -19 +21,0 @@ -Cc: stable@dpdk.org @@ -33 +35 @@ -index 2c797ae751..6f197396a4 100644 +index 6857732028..9c237bdb72 100644 @@ -36 +38 @@ -@@ -24,7 +24,6 @@ +@@ -25,7 +25,6 @@ @@ -45 +47 @@ -index 5922bfea8e..5d92b476e2 100644 +index c9eeaa02fc..b673370f20 100644 @@ -48 +50 @@ -@@ -1126,9 +1126,9 @@ nfp_net_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) +@@ -977,9 +977,9 @@ nfp_net_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) @@ -61 +63 @@ -index 49c89ac327..4486ffa72c 100644 +index 8cf99c0eae..67c8dc33d8 100644 @@ -73 +75 @@ -index 47d5dff16c..56fb8e8c73 100644 +index cf7a4389b3..dc63b05bd6 100644 @@ -76 +78 @@ -@@ -603,6 +603,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) +@@ -604,6 +604,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) @@ -85 +87 @@ -index 7834b2ee0c..d69ac8cd37 100644 +index 865cac7741..1877d6b76b 100644 @@ -88 +90 @@ -@@ -365,6 +365,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) +@@ -361,6 +361,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)