From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <amo@semihalf.com>
Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com
[209.85.167.65]) by dpdk.org (Postfix) with ESMTP id 33EE55F36
for <dev@dpdk.org>; Thu, 20 Sep 2018 11:05:46 +0200 (CEST)
Received: by mail-lf1-f65.google.com with SMTP id m26-v6so7676215lfb.0
for <dev@dpdk.org>; Thu, 20 Sep 2018 02:05:46 -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=FmlilUNGhHM7ewSaBbK4njhq6v2GxL2pKxDnXmcT+sc=;
b=NaGO59fp8vdK0+0PgVBBUK18szsNaKZCbh2wJhRSvRC0C4SdEgrRSxx45PCpi+gb5c
yI++RFWJQyFFpsirCQ25JFVL2c8xyqk4cmsvdM6PMCI8KaUpWQhKLMtBURUOh/fO/4wq
k5Cu3wNuwvrs8ZyhT5StNOSB+nwIG36RZg5CBM35rRKryxOSCcU3UpuiKVYe68G0qFW8
lulUJl4PzS5LvafjQpPZnplaVnFW16N0IV+BbsuETQsDztO0kNoiG42GM0gI7G73+yHm
i//1x+GWNaOho4rb7aL4K2Y0Z9Gs0wwL0ySzlAOXpJN5oz7VGp4my7n+V2ixfyAYeC0F
N8Wg==
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=FmlilUNGhHM7ewSaBbK4njhq6v2GxL2pKxDnXmcT+sc=;
b=r2+EeofRC7IuSn28E4dn+YJp00s6Q8q8xk5msBTU4KA2AN0ReZQnYkar37hTDiWsqt
u5UmHshKHfK/5NmT04zBa0XMlWNH920sDWj2iCpw325alB9sU2tsebX/zWlswZrvKrPo
gaJVYwwrautQO+b9JAQtFsCfa2+Ow/OzbDujeGUm8cFbg125f8n5UzFZf7mCro4lzwMH
+2MXpbnlAp5daxCkWL+af3pDP0oT5ZmhvvYDy5r3uPsK5xfJIP+f2z3aE6naFNQnYwQV
PK95xqeoPmgBe0z4e4Jq8rXTxTzWzHMUbMqTzR81CdS5HyvUGpKJKtlf+Q9fFn2qSjKc
46qw==
X-Gm-Message-State: APzg51AvkZb3e5V99xqG9GnUUjqKkBwACu4ClotwYAzjB/uQ9Qt+0iNW
8QKcr9z75mtMtVEi3iL8AXnx1iwIRZw=
X-Google-Smtp-Source: ANB0VdYaqYSQduGXBVYMCBeOnhjv2as5AClhyOSaym2/h3199BaPxsUyrGx0N/6RruksF2B1Vj2wEw==
X-Received: by 2002:a19:1588:: with SMTP id 8-v6mr12403557lfv.36.1537434345327;
Thu, 20 Sep 2018 02:05:45 -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
g16-v6sm4338106lje.1.2018.09.20.02.05.44
(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Thu, 20 Sep 2018 02:05:44 -0700 (PDT)
From: Andrzej Ostruszka <amo@semihalf.com>
To: dev@dpdk.org
Cc: mw@semihalf.com,
zr@semihalf.com,
tdu@semihalf.com,
nadavh@marvell.com
Date: Thu, 20 Sep 2018 11:05:34 +0200
Message-Id: <1537434339-22570-4-git-send-email-amo@semihalf.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1537434339-22570-1-git-send-email-amo@semihalf.com>
References: <1537369294-17099-1-git-send-email-amo@semihalf.com>
<1537434339-22570-1-git-send-email-amo@semihalf.com>
Subject: [dpdk-dev] [PATCH v5 3/8] net/mvneta: support for setting of MTU
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: Thu, 20 Sep 2018 09:05:46 -0000
From: Zyta Szpak <zr@semihalf.com>
Add callback for setting of MTU.
Signed-off-by: Natalie Samsonov <nsamsono@marvell.com>
Signed-off-by: Zyta Szpak <zr@semihalf.com>
---
doc/guides/nics/features/mvneta.ini | 1 +
doc/guides/nics/mvneta.rst | 1 +
drivers/net/mvneta/mvneta_ethdev.c | 78 +++++++++++++++++++++++++++++++++++++
3 files changed, 80 insertions(+)
diff --git a/doc/guides/nics/features/mvneta.ini b/doc/guides/nics/features/mvneta.ini
index 0a89e2f..bc4e400 100644
--- a/doc/guides/nics/features/mvneta.ini
+++ b/doc/guides/nics/features/mvneta.ini
@@ -5,6 +5,7 @@
;
[Features]
Speed capabilities = Y
+MTU update = Y
Jumbo frame = Y
CRC offload = Y
L3 checksum offload = Y
diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst
index 9d25c40..55ffe57 100644
--- a/doc/guides/nics/mvneta.rst
+++ b/doc/guides/nics/mvneta.rst
@@ -30,6 +30,7 @@ Features of the MVNETA PMD are:
- tx/rx_burst
- Speed capabilities
- Jumbo frame
+- MTU update
- CRC offload
- L3 checksum offload
- L4 checksum offload
diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index 331cd1d..1b26c87 100644
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -221,6 +221,77 @@ mvneta_dev_supported_ptypes_get(struct rte_eth_dev *dev __rte_unused)
}
/**
+ * DPDK callback to change the MTU.
+ *
+ * Setting the MTU affects hardware MRU (packets larger than the MRU
+ * will be dropped).
+ *
+ * @param dev
+ * Pointer to Ethernet device structure.
+ * @param mtu
+ * New MTU.
+ *
+ * @return
+ * 0 on success, negative error value otherwise.
+ */
+static int
+mvneta_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+{
+ struct mvneta_priv *priv = dev->data->dev_private;
+ uint16_t mbuf_data_size = 0; /* SW buffer size */
+ uint16_t mru;
+ int ret;
+
+ mru = MRVL_NETA_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.
+ */
+ if (!dev->data->scattered_rx &&
+ (mru + MRVL_NETA_PKT_OFFS > mbuf_data_size)) {
+ mru = mbuf_data_size - MRVL_NETA_PKT_OFFS;
+ mtu = MRVL_NETA_MRU_TO_MTU(mru);
+ MVNETA_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 > MVNETA_PKT_SIZE_MAX) {
+ MVNETA_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)
+ /* It is OK. New MTU will be set later on mvneta_dev_start */
+ return 0;
+
+ ret = neta_ppio_set_mru(priv->ppio, mru);
+ if (ret) {
+ MVNETA_LOG(ERR, "Failed to change MRU");
+ return ret;
+ }
+
+ ret = neta_ppio_set_mtu(priv->ppio, mtu);
+ if (ret) {
+ MVNETA_LOG(ERR, "Failed to change MTU");
+ return ret;
+ }
+ MVNETA_LOG(INFO, "MTU changed to %u, MRU = %u", mtu, mru);
+
+ return 0;
+}
+
+/**
* DPDK callback to bring the link up.
*
* @param dev
@@ -318,6 +389,12 @@ mvneta_dev_start(struct rte_eth_dev *dev)
}
}
+ ret = mvneta_mtu_set(dev, dev->data->mtu);
+ if (ret) {
+ MVNETA_LOG(ERR, "Failed to set MTU %d", dev->data->mtu);
+ goto out;
+ }
+
ret = mvneta_dev_set_link_up(dev);
if (ret) {
MVNETA_LOG(ERR, "Failed to set link up");
@@ -433,6 +510,7 @@ static const struct eth_dev_ops mvneta_ops = {
.dev_set_link_down = mvneta_dev_set_link_down,
.dev_close = mvneta_dev_close,
.mac_addr_set = mvneta_mac_addr_set,
+ .mtu_set = mvneta_mtu_set,
.dev_infos_get = mvneta_dev_infos_get,
.dev_supported_ptypes_get = mvneta_dev_supported_ptypes_get,
.rxq_info_get = mvneta_rxq_info_get,
--
2.7.4