From patchwork Fri Jan 6 09:05:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xing, Beilei" X-Patchwork-Id: 121660 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E74BDA00C2; Fri, 6 Jan 2023 10:28:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5827242D39; Fri, 6 Jan 2023 10:28:06 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 9F46442D2C for ; Fri, 6 Jan 2023 10:28:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672997284; x=1704533284; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dEfSiFkacgZ+UF6aDGmOsOdIgqXCS9DyzG8rYSXTDag=; b=V58dik0HfBQjRm/somfAep/CY0HmgW37STYs+/EyEyVtAFgTJtudMua4 ShzQrPxeFGlxHdihvuC4y9txmW/fS+sUXATfBEG/stC8gyKVOdUiGV2+T jqazAsQ3iqQoFX73DdvJ1zpIN/hjQOH3WSnkjstOPddhOqH2EHtTvpMox PQolFnO0uo0N2R84BA6MUX2b4IiaGIS37XTYYcxJHY/wy9aeNSCOXBuQa RdwtnBwZIxnrmk3Q0U1tpWRdGaOaP4Ssvh3hApCEk55x2r6hRoW/mc9Eg UHYxCQTgxDGpeNpSvwmHQezeNZin2RvwlMtFw5BawqV1wBs2wvrT/uMdR A==; X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="386893927" X-IronPort-AV: E=Sophos;i="5.96,304,1665471600"; d="scan'208";a="386893927" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2023 01:28:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="655907988" X-IronPort-AV: E=Sophos;i="5.96,304,1665471600"; d="scan'208";a="655907988" Received: from dpdk-beileix-3.sh.intel.com ([10.67.110.253]) by orsmga002.jf.intel.com with ESMTP; 06 Jan 2023 01:28:02 -0800 From: beilei.xing@intel.com To: qi.z.zhang@intel.com Cc: dev@dpdk.org, Jingjing Wu , Beilei Xing Subject: [PATCH v2 5/5] net/idpf: refine MTU setting Date: Fri, 6 Jan 2023 09:05:01 +0000 Message-Id: <20230106090501.9106-6-beilei.xing@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20230106090501.9106-1-beilei.xing@intel.com> References: <20221208072725.32434-1-beilei.xing@intel.com> <20230106090501.9106-1-beilei.xing@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Jingjing Wu This patch refines MTU configuration. Signed-off-by: Jingjing Wu Signed-off-by: Beilei Xing --- drivers/net/idpf/idpf_ethdev.c | 37 +++++++++++++++++++--------------- drivers/net/idpf/idpf_ethdev.h | 1 + 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c index 89af27ca34..3f1b77144c 100644 --- a/drivers/net/idpf/idpf_ethdev.c +++ b/drivers/net/idpf/idpf_ethdev.c @@ -56,9 +56,9 @@ idpf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_rx_queues = adapter->caps->max_rx_q; dev_info->max_tx_queues = adapter->caps->max_tx_q; dev_info->min_rx_bufsize = IDPF_MIN_BUF_SIZE; - dev_info->max_rx_pktlen = IDPF_MAX_FRAME_SIZE; + dev_info->max_rx_pktlen = vport->max_mtu + IDPF_ETH_OVERHEAD; - dev_info->max_mtu = dev_info->max_rx_pktlen - IDPF_ETH_OVERHEAD; + dev_info->max_mtu = vport->max_mtu; dev_info->min_mtu = RTE_ETHER_MIN_MTU; dev_info->flow_type_rss_offloads = IDPF_RSS_OFFLOAD_ALL; @@ -104,14 +104,23 @@ idpf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) } static int -idpf_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu __rte_unused) +idpf_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) { + struct idpf_vport *vport = dev->data->dev_private; + /* mtu setting is forbidden if port is start */ if (dev->data->dev_started) { PMD_DRV_LOG(ERR, "port must be stopped before configuration"); return -EBUSY; } + if (mtu > vport->max_mtu) { + PMD_DRV_LOG(ERR, "MTU should be less than %d", vport->max_mtu); + return -EINVAL; + } + + vport->max_pkt_len = mtu + IDPF_ETH_OVERHEAD; + return 0; } @@ -381,6 +390,10 @@ idpf_dev_configure(struct rte_eth_dev *dev) return -1; } + vport->max_pkt_len = + (dev->data->mtu == 0) ? IDPF_DEFAULT_MTU : dev->data->mtu + + IDPF_ETH_OVERHEAD; + return 0; } @@ -513,39 +526,31 @@ idpf_dev_start(struct rte_eth_dev *dev) vport->stopped = 0; - if (dev->data->mtu > vport->max_mtu) { - PMD_DRV_LOG(ERR, "MTU should be less than %d", vport->max_mtu); - ret = -EINVAL; - goto err_mtu; - } - - vport->max_pkt_len = dev->data->mtu + IDPF_ETH_OVERHEAD; - req_vecs_num = IDPF_DFLT_Q_VEC_NUM; if (req_vecs_num + adapter->used_vecs_num > num_allocated_vectors) { PMD_DRV_LOG(ERR, "The accumulated request vectors' number should be less than %d", num_allocated_vectors); ret = -EINVAL; - goto err_mtu; + goto err_vec; } ret = idpf_vc_alloc_vectors(vport, req_vecs_num); if (ret != 0) { PMD_DRV_LOG(ERR, "Failed to allocate interrupt vectors"); - goto err_mtu; + goto err_vec; } adapter->used_vecs_num += req_vecs_num; ret = idpf_config_rx_queues_irqs(dev); if (ret != 0) { PMD_DRV_LOG(ERR, "Failed to configure irqs"); - goto err_mtu; + goto err_vec; } ret = idpf_start_queues(dev); if (ret != 0) { PMD_DRV_LOG(ERR, "Failed to start queues"); - goto err_mtu; + goto err_vec; } idpf_set_rx_function(dev); @@ -561,7 +566,7 @@ idpf_dev_start(struct rte_eth_dev *dev) err_vport: idpf_stop_queues(dev); -err_mtu: +err_vec: return ret; } diff --git a/drivers/net/idpf/idpf_ethdev.h b/drivers/net/idpf/idpf_ethdev.h index bf37d5184c..b0746e5041 100644 --- a/drivers/net/idpf/idpf_ethdev.h +++ b/drivers/net/idpf/idpf_ethdev.h @@ -39,6 +39,7 @@ #define IDPF_MIN_BUF_SIZE 1024 #define IDPF_MAX_FRAME_SIZE 9728 #define IDPF_MIN_FRAME_SIZE 14 +#define IDPF_DEFAULT_MTU RTE_ETHER_MTU #define IDPF_NUM_MACADDR_MAX 64