From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by dpdk.org (Postfix) with ESMTP id 1959428F3 for ; Tue, 1 May 2018 12:47:37 +0200 (CEST) Received: by mail-wr0-f193.google.com with SMTP id i14-v6so7314745wre.2 for ; Tue, 01 May 2018 03:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=T6jCDzHHdRD7O5Ym+R19jqA/3JZQooi1OQirboLLMKE=; b=UdvmOOxKRFmNd9K3REn4S+KaUqGTlCHLVt7meN0O9YV8XAaaozyirQPVRoD8if0YMj y5NlBh6xSKFYPKbw8eOl52CrzXebcYzYw49bRaF56lBnhxr7JoB7f0Yf02zrIf5sBsNf u5RhGIiKMLWFKAS7hUWZe4kXlBK7lcnyOtioBxrFFkh4dk4Lhw+z6P9OTgxClnVJfWU6 cenLk30FWRuDp5+RfEG1FUZi6vtvsMsWihHWasg4OdTpec3n2GSjqCOCeLQ3cL7XMoSm K3eGCD9TNm2i8JHp1VsdJwwoeDGfVI5HJOrWpYcGpJtCYMplvMgvN9+GIAyLrn6upGjj pHIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=T6jCDzHHdRD7O5Ym+R19jqA/3JZQooi1OQirboLLMKE=; b=R+pyuWBAnajZDXNaIEyjUR2A26yiH2g+FHfU7ZfHeQ+OQ1KAwDdle/m/kI+HrFq7k4 QbUzodTx+Oj6SY6BNRyYimkIBV1jb493DuwwxqWftCYDcbgRl3Hdafw8xC1WlE9NT3J3 mVq1vQxHLcLT+yVxQLjDqItM6O4G65XmHWP3Hwp8Hwrc19VZ+a2b0UF+Y0uJtixor6JX VEGN3el4E99de55u7gO3gxKgaPxa1sMF4l31qp9xOK/3RyFMM7PUkyo+kux4+/x0ewZt nY0FOZJ1+N7hoQFP/H1F55jd4EzsW8uqqwGqFEkPHm/cM+Hn2rzQAd6zLZTB9Cic/nRJ PBKA== X-Gm-Message-State: ALQs6tA3C18WsQmO/PQlLYCbMZenk7uBuWGxecHZExRrNBX7R7etZ/2G Nvtnofq208OTBCeCtFc+STChtz4kYC0= X-Google-Smtp-Source: AB8JxZrFVHrFCgzIpMdiOqbJUVnJUZfIOihrINMtZekeXTQ5L6GuEt914XtS1dllRJwHO0u4tW6R0g== X-Received: by 2002:adf:b595:: with SMTP id c21-v6mr12114544wre.233.1525171657372; Tue, 01 May 2018 03:47:37 -0700 (PDT) Received: from localhost (slip139-92-244-193.lon.uk.prserv.net. [139.92.244.193]) by smtp.gmail.com with ESMTPSA id q194sm11747018wmd.26.2018.05.01.03.47.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 May 2018 03:47:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Nitin Saxena Cc: Jerin Jacob , dpdk stable Date: Tue, 1 May 2018 11:45:03 +0100 Message-Id: <20180501104509.17238-40-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180501104509.17238-1-luca.boccassi@gmail.com> References: <20180501104509.17238-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/thunderx: fix MTU configuration for jumbo packets' has been queued to LTS release 16.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 May 2018 10:47:38 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/03/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 09478aeaa6030e1988bac0593552b51d72d96ef4 Mon Sep 17 00:00:00 2001 From: Nitin Saxena Date: Mon, 16 Apr 2018 10:44:47 +0000 Subject: [PATCH] net/thunderx: fix MTU configuration for jumbo packets [ upstream commit c77875fbb8004c22e9910338f93b7be3e29ab9f9 ] thunderx pmd driver passes dev_info.max_rx_pktlen as 9200 (via rte_eth_dev_info_get()) to application. But, when application tries to set MTU as (9200 - sizeof(ethernet_header_t)) the operation fails because of missing CRC and VLAN additions. This patch fixes the following for thunderx pmd driver: - Sets NIC_HW_MAX_FRS to 9216 (instead of 9200) - Sets NIC_HW_MAX_MTU to 9190 (NIC_HW_MAX_FRS - ETH_HLEN - ETHER_CRC_LEN - 2*VLAN_HLEN) - Sets dev_info->max_rx_pkt_len to NIC_HW_MAX_MTU + ETH_HLEN (instead of 9200) - Allows rte_eth_dev_set_mtu() to pass if application (like VPP) calls rte_eth_dev_set_mtu() before rte_eth_dev_start() by putting appropriate check for dev->data->dev_started Fixes: 65d9804edc05 ("net/thunderx: support MTU configuration") Signed-off-by: Nitin Saxena Acked-by: Jerin Jacob --- drivers/net/thunderx/base/nicvf_hw_defs.h | 5 ++++- drivers/net/thunderx/nicvf_ethdev.c | 15 +++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/net/thunderx/base/nicvf_hw_defs.h b/drivers/net/thunderx/base/nicvf_hw_defs.h index 00dd2feb9..256e8daf8 100644 --- a/drivers/net/thunderx/base/nicvf_hw_defs.h +++ b/drivers/net/thunderx/base/nicvf_hw_defs.h @@ -197,7 +197,10 @@ /* Min/Max packet size */ #define NIC_HW_MIN_FRS (64) -#define NIC_HW_MAX_FRS (9200) /* 9216 max pkt including FCS */ +/* ETH_HLEN+ETH_FCS_LEN+2*VLAN_HLEN */ +#define NIC_HW_L2_OVERHEAD (26) +#define NIC_HW_MAX_MTU (9190) +#define NIC_HW_MAX_FRS (NIC_HW_MAX_MTU + NIC_HW_L2_OVERHEAD) #define NIC_HW_MAX_SEGS (12) /* Descriptor alignments */ diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index d229bdff3..d0f0d52dd 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -161,7 +161,7 @@ static int nicvf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) { struct nicvf *nic = nicvf_pmd_priv(dev); - uint32_t buffsz, frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; + uint32_t buffsz, frame_size = mtu + NIC_HW_L2_OVERHEAD; size_t i; PMD_INIT_FUNC_TRACE(); @@ -178,7 +178,7 @@ nicvf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) * Refuse mtu that requires the support of scattered packets * when this feature has not been enabled before. */ - if (!dev->data->scattered_rx && + if (dev->data->dev_started && !dev->data->scattered_rx && (frame_size + 2 * VLAN_TAG_SIZE > buffsz)) return -EINVAL; @@ -192,11 +192,11 @@ nicvf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) else dev->data->dev_conf.rxmode.jumbo_frame = 0; - if (nicvf_mbox_update_hw_max_frs(nic, frame_size)) + if (nicvf_mbox_update_hw_max_frs(nic, mtu)) return -EINVAL; - /* Update max frame size */ - dev->data->dev_conf.rxmode.max_rx_pkt_len = (uint32_t)frame_size; + /* Update max_rx_pkt_len */ + dev->data->dev_conf.rxmode.max_rx_pkt_len = mtu + ETHER_HDR_LEN; nic->mtu = mtu; for (i = 0; i < nic->sqs_count; i++) @@ -1338,7 +1338,7 @@ nicvf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) PMD_INIT_FUNC_TRACE(); dev_info->min_rx_bufsize = ETHER_MIN_MTU; - dev_info->max_rx_pktlen = NIC_HW_MAX_FRS; + dev_info->max_rx_pktlen = NIC_HW_MAX_MTU + ETHER_HDR_LEN; dev_info->max_rx_queues = (uint16_t)MAX_RCV_QUEUES_PER_QS * (MAX_SQS_PER_VF + 1); dev_info->max_tx_queues = @@ -1658,8 +1658,7 @@ nicvf_dev_start(struct rte_eth_dev *dev) /* Setup MTU based on max_rx_pkt_len or default */ mtu = dev->data->dev_conf.rxmode.jumbo_frame ? dev->data->dev_conf.rxmode.max_rx_pkt_len - - ETHER_HDR_LEN - ETHER_CRC_LEN - : ETHER_MTU; + - ETHER_HDR_LEN : ETHER_MTU; if (nicvf_dev_set_mtu(dev, mtu)) { PMD_INIT_LOG(ERR, "Failed to set default mtu size"); -- 2.14.2