From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <amo@semihalf.com>
Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com
[209.85.208.194]) by dpdk.org (Postfix) with ESMTP id 7CEB71E34
for <dev@dpdk.org>; Tue, 25 Sep 2018 09:05:21 +0200 (CEST)
Received: by mail-lj1-f194.google.com with SMTP id f8-v6so20644957ljk.1
for <dev@dpdk.org>; Tue, 25 Sep 2018 00:05:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=semihalf-com.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references;
bh=Lq2A20v6d+3qvNXSF2sBgr6zAeGZATPNRfTZYtVXC6U=;
b=AX7y0sKbFWEjIRsNwpQof7mKTlnS4Sb+qrDA1KF1NMgz4LcV4QGEfHtElWFwEkyYHV
cXh6vZmadmKYMzIKGZYc+1g7KOOGzqfMc49oo3W3T1L7/8UQz4cC8qjTgkwmznEHztjw
79GqDMM+YfF338d54vD1O74xVQ+m5xS3MQo/dBDlDQ+nvwqknMF1lBrCPlsuemoIad1u
iOvnAaiPlRvu9v2q0vDnDa0zZOAbkLdog9PrhDuTwoWPSsjaMNpQAbsxA7yoCvQXlnJo
U+LNlDeIqYxbmcuUersR6hNqOLuqrCr0wPnJnoy4zfTSWFqlzcS8HK0Ce0ktGcu2K64D
IpXQ==
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=Lq2A20v6d+3qvNXSF2sBgr6zAeGZATPNRfTZYtVXC6U=;
b=lo0X9hlBUe2YH3ir4jdIvb1yKjsRFDKDIgnR81j11XJ/0p5JSwaR4PvuaKXLFOIjwp
ZfrkUivp2dosVylmryDku897u+I10OoSMrr7kiFDwnmlHSU51ae482Lq9yYOYmFbUuOs
HNvW4H2p3A9nrLfYsksoDNF6rvtWqsadJx78TFQd5AUQLJyYrcEjebRamHWlH8g+GU+E
U+TnDcZeaTbd8PrRD5IYI4y8BsGZPvWqFHr4+MrSKunm8OvftUKvDUhBQAnXDnql1uAZ
je/+jQk2irXOu+qsNx+nSCkuCY6PVVXQ4DNhr+Qh+UkRGWVZsmqPbqNbTycjoM+1cqjJ
sj+A==
X-Gm-Message-State: ABuFfoiGVMbPM+K8b4XF/sB0htlrdin17vrw5M2ghXRD0fH3cq40mi3p
+MaJaslLqNj6kU0ak6BpBH6Faaov34YLWQ==
X-Google-Smtp-Source: ACcGV61SsovtUUVtCjfomWl3zjlpyOGQf6WCaIOQL7TC/cYYc6ZTVsmCOJfh+L8Ccz/TQPRptuD/pw==
X-Received: by 2002:a2e:4619:: with SMTP id
t25-v6mr1615256lja.96.1537859120848;
Tue, 25 Sep 2018 00:05:20 -0700 (PDT)
Received: from amok.semihalf.local (31-172-191-173.noc.fibertech.net.pl.
[31.172.191.173])
by smtp.googlemail.com with ESMTPSA id 24-v6sm238306ljb.76.2018.09.25.00.05.19
(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Tue, 25 Sep 2018 00:05:19 -0700 (PDT)
From: Andrzej Ostruszka <amo@semihalf.com>
To: dev@dpdk.org
Cc: mw@semihalf.com, nadavh@marvell.com,
Natalie Samsonov <nsamsono@marvell.com>
Date: Tue, 25 Sep 2018 09:05:04 +0200
Message-Id: <1537859109-25659-9-git-send-email-amo@semihalf.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1537859109-25659-1-git-send-email-amo@semihalf.com>
References: <1536068953-9352-1-git-send-email-tdu@semihalf.com>
<1537859109-25659-1-git-send-email-amo@semihalf.com>
Subject: [dpdk-dev] [PATCH v3 08/13] net/mvpp2: update MTU and MRU related
calculations
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Sep 2018 07:05:21 -0000
From: Natalie Samsonov <nsamsono@marvell.com>
This commit updates MTU and MRU related calculations.
Signed-off-by: Natalie Samsonov <nsamsono@marvell.com>
Reviewed-by: Yelena Krivosheev <yelena@marvell.com>
Reviewed-by: Dmitri Epshtein <dima@marvell.com>
---
drivers/net/mvpp2/mrvl_ethdev.c | 70 +++++++++++++++++++++++++++++++----------
drivers/net/mvpp2/mrvl_ethdev.h | 7 +++++
2 files changed, 61 insertions(+), 16 deletions(-)
diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 64c6f0f..24bd0a5 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -316,7 +316,7 @@ mrvl_dev_configure(struct rte_eth_dev *dev)
if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME)
dev->data->mtu = dev->data->dev_conf.rxmode.max_rx_pkt_len -
- ETHER_HDR_LEN - ETHER_CRC_LEN;
+ MRVL_PP2_ETH_HDRS_LEN;
ret = mrvl_configure_rxqs(priv, dev->data->port_id,
dev->data->nb_rx_queues);
@@ -366,21 +366,55 @@ static int
mrvl_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
{
struct mrvl_priv *priv = dev->data->dev_private;
- /* extra MV_MH_SIZE bytes are required for Marvell tag */
- uint16_t mru = mtu + MV_MH_SIZE + ETHER_HDR_LEN + ETHER_CRC_LEN;
+ uint16_t mru;
+ uint16_t mbuf_data_size = 0; /* SW buffer size */
int ret;
- if (mtu < ETHER_MIN_MTU || mru > MRVL_PKT_SIZE_MAX)
+ mru = MRVL_PP2_MTU_TO_MRU(mtu);
+ /*
+ * min_rx_buf_size is equal to mbuf data size
+ * if pmd didn't set it differently
+ */
+ mbuf_data_size = dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM;
+ /* Prevent PMD from:
+ * - setting mru greater than the mbuf size resulting in
+ * hw and sw buffer size mismatch
+ * - setting mtu that requires the support of scattered packets
+ * when this feature has not been enabled/supported so far
+ * (TODO check scattered_rx flag here once scattered RX is supported).
+ */
+ if (mru + MRVL_PKT_OFFS > mbuf_data_size) {
+ mru = mbuf_data_size - MRVL_PKT_OFFS;
+ mtu = MRVL_PP2_MRU_TO_MTU(mru);
+ MRVL_LOG(WARNING, "MTU too big, max MTU possible limitted "
+ "by current mbuf size: %u. Set MTU to %u, MRU to %u",
+ mbuf_data_size, mtu, mru);
+ }
+
+ if (mtu < ETHER_MIN_MTU || mru > MRVL_PKT_SIZE_MAX) {
+ MRVL_LOG(ERR, "Invalid MTU [%u] or MRU [%u]", mtu, mru);
return -EINVAL;
+ }
+
+ dev->data->mtu = mtu;
+ dev->data->dev_conf.rxmode.max_rx_pkt_len = mru - MV_MH_SIZE;
if (!priv->ppio)
return 0;
ret = pp2_ppio_set_mru(priv->ppio, mru);
- if (ret)
+ if (ret) {
+ MRVL_LOG(ERR, "Failed to change MRU");
return ret;
+ }
+
+ ret = pp2_ppio_set_mtu(priv->ppio, mtu);
+ if (ret) {
+ MRVL_LOG(ERR, "Failed to change MTU");
+ return ret;
+ }
- return pp2_ppio_set_mtu(priv->ppio, mtu);
+ return 0;
}
/**
@@ -591,6 +625,9 @@ mrvl_dev_start(struct rte_eth_dev *dev)
}
priv->vlan_flushed = 1;
}
+ ret = mrvl_mtu_set(dev, dev->data->mtu);
+ if (ret)
+ MRVL_LOG(ERR, "Failed to set MTU to %d", dev->data->mtu);
/* For default QoS config, don't start classifier. */
if (mrvl_qos_cfg &&
@@ -1542,8 +1579,8 @@ mrvl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
{
struct mrvl_priv *priv = dev->data->dev_private;
struct mrvl_rxq *rxq;
- uint32_t min_size,
- max_rx_pkt_len = dev->data->dev_conf.rxmode.max_rx_pkt_len;
+ uint32_t frame_size, buf_size = rte_pktmbuf_data_room_size(mp);
+ uint32_t max_rx_pkt_len = dev->data->dev_conf.rxmode.max_rx_pkt_len;
int ret, tc, inq;
uint64_t offloads;
@@ -1558,15 +1595,16 @@ mrvl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
return -EFAULT;
}
- min_size = rte_pktmbuf_data_room_size(mp) - RTE_PKTMBUF_HEADROOM -
- MRVL_PKT_EFFEC_OFFS;
- if (min_size < max_rx_pkt_len) {
- MRVL_LOG(ERR,
- "Mbuf size must be increased to %u bytes to hold up to %u bytes of data.",
- max_rx_pkt_len + RTE_PKTMBUF_HEADROOM +
- MRVL_PKT_EFFEC_OFFS,
+ frame_size = buf_size - RTE_PKTMBUF_HEADROOM - MRVL_PKT_EFFEC_OFFS;
+ if (frame_size < max_rx_pkt_len) {
+ MRVL_LOG(WARNING,
+ "Mbuf size must be increased to %u bytes to hold up "
+ "to %u bytes of data.",
+ buf_size + max_rx_pkt_len - frame_size,
max_rx_pkt_len);
- return -EINVAL;
+ dev->data->dev_conf.rxmode.max_rx_pkt_len = frame_size;
+ MRVL_LOG(INFO, "Setting max rx pkt len to %u",
+ dev->data->dev_conf.rxmode.max_rx_pkt_len);
}
if (dev->data->rx_queues[idx]) {
diff --git a/drivers/net/mvpp2/mrvl_ethdev.h b/drivers/net/mvpp2/mrvl_ethdev.h
index 984f31e..f0ae983 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.h
+++ b/drivers/net/mvpp2/mrvl_ethdev.h
@@ -72,6 +72,13 @@
/** Minimum number of sent buffers to release from shadow queue to BM */
#define MRVL_PP2_BUF_RELEASE_BURST_SIZE 64
+#define MRVL_PP2_VLAN_TAG_LEN 4
+#define MRVL_PP2_ETH_HDRS_LEN (ETHER_HDR_LEN + ETHER_CRC_LEN + \
+ (2 * MRVL_PP2_VLAN_TAG_LEN))
+#define MRVL_PP2_HDRS_LEN (MV_MH_SIZE + MRVL_PP2_ETH_HDRS_LEN)
+#define MRVL_PP2_MTU_TO_MRU(mtu) ((mtu) + MRVL_PP2_HDRS_LEN)
+#define MRVL_PP2_MRU_TO_MTU(mru) ((mru) - MRVL_PP2_HDRS_LEN)
+
/** Maximum length of a match string */
#define MRVL_MATCH_LEN 16
--
2.7.4