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 46F5BA0093 for ; Wed, 11 May 2022 03:16:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3646B4111B; Wed, 11 May 2022 03:16:23 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2118.outbound.protection.outlook.com [40.107.244.118]) by mails.dpdk.org (Postfix) with ESMTP id 3D8CF4067E; Wed, 11 May 2022 03:16:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ga/NBO/RTESVHyKsGrLje82fJ2seLZCEbU2EbZrMSNfyUsixYonq3Z/zJRz1r4tbuIbQ84lzy43INyNRP8ZM7mCYtjSa8b/en2Sq9grCPLO+G7G0H+Av7EEEvaQoaEv14gj6pAa//nekOGPgC8TlJz4hsTnkJgIWMRwm3sCu753+nN8gld+v3Ki6U4Op3STMiNoIUQkGy/Pizcj712DVp4m4Z2+2tIa/rZhj3WJJeJPCJV/cbi7TGhU5lByE1ztU+xjzM/hoUefDDQpTwdJjwHUSfKo0IUj0QUUpamFB9LI0Ve8S/T/QSDopEBaOxJ0krrvaPo3bpIqFrkaoZGxWuA== 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=MQRqiL2/UI5EafJYGVgph9Hphbh2/56nBPKb9TNiEkY=; b=kH5ReqVVw1rnqw8u0gQoLIUSigCxhepYf6YWqFNu0oaX2nfepcDW45KVXWEyjL9EI86ZUTje+Du8x8YJ/aXyqfi9d7YWpV+Gc6CLoEQhXL8tjmlqGRXI/Qv8qsIbkc8Ziwns+9pvyBEQH804bjnn7pFR4Cbgxt/3guq5/weZnFpSJqVuTtMVMRIu32Fv2zgfCQc8gZy7CpvIxAFiS//zPqqlskHqcZkKC6UCftXtC6AL17S+/86vbAZGfA2wR0CSJ7gZO1iYxxr0XUzre1eNu/TTPiFFUuDuCqHfF/lY6uDNepkSnNd5qkIpmBDdXUrNuFucbyVbHcHJVi+MZ6MQlQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MQRqiL2/UI5EafJYGVgph9Hphbh2/56nBPKb9TNiEkY=; b=V4G8UblLXDQfa+jvymZvhtjheTG90Urt7yWcLjA8UJmG4RbY28fKVR4vlMPUwN+vJoG4dJ8GGVUIBgyZBCPzW+JkYm/D40RfEmyv7H1DKf8H8VymDCDWpLAH/Isg7klSVci5xgMhpsteTvnMwL1STt+2rZkCeKY0WbrDDyaNMCI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from DM5PR1301MB1994.namprd13.prod.outlook.com (2603:10b6:4:2d::36) by PH7PR13MB5933.namprd13.prod.outlook.com (2603:10b6:510:152::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.12; Wed, 11 May 2022 01:16:16 +0000 Received: from DM5PR1301MB1994.namprd13.prod.outlook.com ([fe80::ecb7:bb70:9e83:d660]) by DM5PR1301MB1994.namprd13.prod.outlook.com ([fe80::ecb7:bb70:9e83:d660%5]) with mapi id 15.20.5250.012; Wed, 11 May 2022 01:16:16 +0000 From: Peng Zhang To: dev@dpdk.org Cc: niklas.soderlund@corigine.com, Peng Zhang , stable@dpdk.org, Chaoyong He , Louis Peens , Walter Heymans Subject: [PATCH v4] net/nfp: make sure MTU is never larger than mbufsize Date: Wed, 11 May 2022 03:15:53 +0200 Message-Id: <20220511011553.2905582-1-peng.zhang@corigine.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220330031751.119830-1-peng.zhang@corigine.com> References: <20220330031751.119830-1-peng.zhang@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: LO4P123CA0092.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:191::7) To DM5PR1301MB1994.namprd13.prod.outlook.com (2603:10b6:4:2d::36) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16c8709d-f65e-4ff5-4a88-08da32ebd87f X-MS-TrafficTypeDiagnostic: PH7PR13MB5933:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tXtiLE+a/gs7xlkNEWZ6ZCLsSMtxqWNJFnffOhoKTWCUydXh9+67UcV/IPQFEKZaeeN0QPa6D98biGxsquGaSfxkPW9PZSp8BRluXnWPbKkKVGQv29CyqfRXe4FYff4JAmBOsQ7Isyucqol/uZt4+6OXLDk1TKYEHwkXe1OXNSon2Gx3fnZFdEMCYtp0CPfn5ReFqYM2A/5dLlp4Vt85L+BlA8y0NLJh1w6HOBHo0juWgGIl2AdUh0E/8AL9eTBAlLqqFCiOzgFQX47CqDVnTxpNeYRj0z8ZTeTR5r3Xofn0W6pMR0tT28MnRthciIZemK5kotwRU7DOckACSnNQ6pXgnJJUUB+CimEUKmTUej2e+gb/+dzXuVOcXuCSIhpheQm7FPzz4vO59tQpB4O+GVccocxTgGtAIdsSVPii6o5EN+IC5NUyXRMxY1YDTMqHU79XXr4PGRcl+um4XBs8yyg3xrb5vz5Y93NO61HQdP12vMq1FEtiW9ZGvUIJZOfDEhIJPnPebgaeNnig2PgmxJ1iLgT0UcH7hibXDam5AiGgcc92OaJklZO4M8G/tClbH8QxvUTV+fK6cbmUNyX3yEsad83RUyI6QMkRPwI2/nfETnc1XyeJrhUcsMoaChnLmx4PpSjVkK+bU+dJyizo6IlQhLxOH2vATWBkKDG5LyF56LeWblyat5289JfIoFb486KYAZZeW5RpYQzmEUc5ZlATzorZ7oRCWexPNK8vARw= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR1301MB1994.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(346002)(39840400004)(366004)(136003)(376002)(396003)(66946007)(186003)(66574015)(38100700002)(36756003)(450100002)(66476007)(44832011)(8936002)(66556008)(6512007)(26005)(83380400001)(5660300002)(2616005)(4326008)(8676002)(1076003)(107886003)(6506007)(54906003)(6916009)(38350700002)(86362001)(508600001)(52116002)(6486002)(2906002)(6666004)(316002)(168963002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NnJhRTNIUWNMTlpKVUhzb2FvMCtLMDk3U2N6WUFPVjlCN3k1RTU2akZNNE1k?= =?utf-8?B?M3RFZENCT2NoU1BIS3htUG93OWtjdVFnQUp2ekNlbEpuM1ZIWUVEVDFQY1Za?= =?utf-8?B?aCtCdnVKVndXbkpjVW9YN2hPMU51MjhZRCtBTHZXeU1ab0Q2VzF6WHR5UXI2?= =?utf-8?B?NzNNQmZrSmp5ZlM3MmJjTlgyUG4yK3lEckQxRHU1YmwvOU9HZVFZSXZBaHBh?= =?utf-8?B?OXhuNFdqTFQzYjNPRk5iNFNqdXlBSkR3dGpUcTJhRWExb1dXazRFS3VleWs0?= =?utf-8?B?YytrNkdQeWlhdFBvczhnRm5EMVcwcklRMFFrcTI3V2oxYWhyUVZaNUpCTTYz?= =?utf-8?B?NkZ2YmtrTDU2M2h3dnViWWlvTWxDeXFRRG52ZmRQUndmQmRuTHNXT3pFSVhr?= =?utf-8?B?VVE4QmxDb1VoWjFXeitEVjFFYU1EdTI0N0hDbWNJcUxGTEdtejdnSTNmelBJ?= =?utf-8?B?dkxXRnpYN0pLamlnVzIwN0VUei9aNUp1Um5hdXRoNVh5WlBEckRha0VjVUNG?= =?utf-8?B?b1g3VDRvcFUwbVUybUxSTFZvZVpIbld6bTdQcUpuMFp4VXBaNVYrVUtRN1p3?= =?utf-8?B?MmFRbCtJcndoTnVua0N3dmVnNnpGbHVoVXpOVURsVndIem91RjdHdlkrKzRj?= =?utf-8?B?ZlhpOE5HK0lwNTZpc3hwUW4wWTBta042cmZIMnU0T0owQ3pZOHU2ZXdKWFVZ?= =?utf-8?B?TThscVBPa05XS1lPZW5XR01EZHA0My9uV1dQTzZ6NFlHS0g1RGJTaTc3NEFY?= =?utf-8?B?YU9tSEpGVnlIemJDaGkwVVE0eTY1aXhDK3FERlBJUkYrbzdEdHg5cU5VWFYv?= =?utf-8?B?M2tIcDdxbXJsWGZsU01OYnhYTUl4ejdpa1Fzc2VzbVFpVkoxQkFzdWlXU3hP?= =?utf-8?B?c1FGamU0a3ZkZDBYSGhDemFaTUROWVBOWnRKbXRzVjRPMlMxeGZ6RlRBdkpX?= =?utf-8?B?Q2ZpLzRiRXBIQ1UvSGI5RDdKMHJyTjJjc2FxWFJwZW1hN0NRelVhVnZjUUox?= =?utf-8?B?S3Q0YVFteU5rNFpnMS9ac0lkOVJaZUVoamxNUTN4aVREbFZiREplUUpqZlY0?= =?utf-8?B?UjE3K0FoWFFDUCsrNWlzY2hqU0Z6VkJ2ZTNLWG9VTWw5eS9FckVFMXFIbUpE?= =?utf-8?B?OVB5TUFoS3lna1NTRzBoQ1dMSFVHTnpkQ2RWd1dHUkEvSjRiTE1OSGdlQVc1?= =?utf-8?B?d0czb05RUS9qYmRHM2o0OUdkY0tYczYwL1UyTzJpNnhFWkNmaStwc1R2TWM3?= =?utf-8?B?WnFtVms0UVF5STBRTkdwU0RxSDdXSDQyV2o5Ukx4U0k4V2tKL1MyakpUZTA4?= =?utf-8?B?b1VHWUc2Zi9zRW84U0lDR1JlQlFaUUZkOXo2Y040b2wwNWNUbGtic0tlMVBz?= =?utf-8?B?WkZXUlZZeW1BTVhUNjh2Vi9YNWh3VkxtUXJVVnN6U3lmeEF1cnNzOTAxZTY2?= =?utf-8?B?MjlTLzlYYkZGd1lsT29za1pJMStNeXZETnB6VzRUbEtKQkdEWlhUNFNJN1dG?= =?utf-8?B?eWxjbldPaXpYbjJZNzhVUDNhS2R2WU90RDg5bXpMTmViWlUxMVBpaTV6Uk1r?= =?utf-8?B?WVozaVZ4eVFhbklYakVpbHBxczZvb3RBRmpCQUpOWWFqNURTeHZhQUZ6M0lQ?= =?utf-8?B?WDVFQk53MlpwaDBOdGliZTlLbEdzaFZqVDFLWHdaWGExMHREd2N4Myt5YW5u?= =?utf-8?B?L0FtSVMwbXB2MzkxeXcrOVJHNW02T0s4dDJONG9NS3RpdUE3NURYTk5xOWcw?= =?utf-8?B?cUJWUXg5ZTZXNjQ1SVVzSVlEdlpWcTVpUDRseExmQmVyTkluUmU2Rm9QZWhy?= =?utf-8?B?NGZPaFo3NEczcG16L3NKdjRyclJQWFo2Z28ydzZkK3VHWE82Rmpici9Cb3Fv?= =?utf-8?B?aWtHKzMwZXhzbkNEejU4a2MwN2VBd09wR1d5SFlucm5vNXB6SjNxa2pnVVA4?= =?utf-8?B?TllPZUxNZTYyTWdzbmZidkh5UW9nUHY3WXkyWUVqRWRyTjF0MGVsd1FBY3h2?= =?utf-8?B?MncrWXplaVhsMWpKcFRxamtOL2RnbFdxa0MybGIxMTFFWmZyZWtPU3g3alcv?= =?utf-8?B?a0FEcjVnZGl3eU4wekJlZG5IS2w0ejhHYStJejZlR25hMkxXb1Q4bFlaTkpL?= =?utf-8?B?aEROZzJIVllTK2RuSWE0NVVzSkZaNFpZaGlEcFlnM2M1bURoL1pveXg1b3RB?= =?utf-8?B?TkNTSHFZOE1hd05zMldKRjBwcEFmYXpqRG1hWXR1blFxTFdtUW8yeWx6SXR1?= =?utf-8?B?SjNTVVZIVkdvdloyMjdJV25oM2p0MTZJdWs0Z0J4aWlRVVNtSklDOFd0YVhz?= =?utf-8?B?Y3pWUzY2OTQ5SmRRZTY1a2J5b2pIZDNxS2RRZ0lEcXVPNnNCeE9ZcHlvdE0y?= =?utf-8?Q?hAH0iWVlaSwkR+LQ=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16c8709d-f65e-4ff5-4a88-08da32ebd87f X-MS-Exchange-CrossTenant-AuthSource: DM5PR1301MB1994.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2022 01:16:16.4145 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0eR61hNuOfjJERPnR3LbqWG+6z+tG2Ac8Vn3a6G9tk7i5zlxNtG3gpevIrh1veviE477B3p3HY6+1TdFT2Otkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB5933 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 Setting a MTU larger than mbufsize is not supported by the device but not prohibited by the driver. This change adds a restriction to the driver to prevent setting an MTU that is too large. While at it define the minimum MTU in the device information to describe the complete supported MTU range. Fixes: d4a27a3 ("nfp: add basic features") Cc: stable@dpdk.org Signed-off-by: Peng Zhang Signed-off-by: Chaoyong He Signed-off-by: Louis Peens Signed-off-by: Niklas Söderlund Reviewed-by: Walter Heymans ------ Depends-on: patch-109914 ("net/nfp: update how MAX MTU is read") --- drivers/net/nfp/nfp_common.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index 52fbda1a79..be68c25fb8 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -176,6 +176,13 @@ nfp_net_configure(struct rte_eth_dev *dev) return -EINVAL; } + /* Checking MTU set */ + if (rxmode->mtu > hw->flbufsz) { + PMD_INIT_LOG(INFO, "MTU (%u) larger then current mbufsize (%u) not supported", + rxmode->mtu, hw->flbufsz); + return -ERANGE; + } + return 0; } @@ -702,6 +709,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) */ dev_info->max_rx_pktlen = NFP_FRAME_SIZE_MAX; dev_info->max_mtu = hw->max_mtu; + dev_info->min_mtu = RTE_ETHER_MIN_MTU; /* Next should change when PF support is implemented */ dev_info->max_mac_addrs = 1; @@ -961,6 +969,13 @@ nfp_net_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) return -EBUSY; } + /* MTU larger then current mbufsize not supported */ + if (mtu > hw->flbufsz) { + PMD_DRV_LOG(ERR, "MTU (%u) larger then current mbufsize (%u) not supported", + mtu, hw->flbufsz); + return -ERANGE; + } + /* writing to configuration space */ nn_cfg_writel(hw, NFP_NET_CFG_MTU, mtu); -- 2.27.0