From: Andrzej Ostruszka <amo@semihalf.com>
To: dev@dpdk.org
Cc: mw@semihalf.com, zr@semihalf.com, tdu@semihalf.com, nsamsono@marvell.com
Subject: [dpdk-dev] [PATCH v2 4/8] net/mvneta: support for setting of MTU
Date: Fri, 31 Aug 2018 14:26:04 +0200 [thread overview]
Message-ID: <1535718368-15803-9-git-send-email-amo@semihalf.com> (raw)
In-Reply-To: <1535718368-15803-1-git-send-email-amo@semihalf.com>
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>
---
drivers/net/mvneta/mvneta_ethdev.c | 149 +++++++++++++++++++++++++++++++++++++
1 file changed, 149 insertions(+)
diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index 968f920..a7e79ea 100644
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -1025,6 +1025,77 @@ static void mvneta_txq_info_get(struct rte_eth_dev *dev, uint16_t tx_queue_id,
}
/**
+ * 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
@@ -1298,6 +1369,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");
@@ -1380,6 +1457,76 @@ mvneta_dev_close(struct rte_eth_dev *dev)
}
/**
+ * DPDK callback to retrieve physical link information.
+ *
+ * @param dev
+ * Pointer to Ethernet device structure.
+ * @param wait_to_complete
+ * Wait for request completion (ignored).
+ *
+ * @return
+ * 0 on success, negative error value otherwise.
+ */
+static int
+mvneta_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
+{
+ /*
+ * TODO
+ * once MUSDK provides necessary API use it here
+ */
+ struct mvneta_priv *priv = dev->data->dev_private;
+ struct ethtool_cmd edata;
+ struct ifreq req;
+ int ret, fd, link_up;
+
+ if (!priv->ppio)
+ return -EPERM;
+
+ edata.cmd = ETHTOOL_GSET;
+
+ strcpy(req.ifr_name, dev->data->name);
+ req.ifr_data = (void *)&edata;
+
+ fd = socket(AF_INET, SOCK_DGRAM, 0);
+ if (fd == -1)
+ return -EFAULT;
+ ret = ioctl(fd, SIOCETHTOOL, &req);
+ if (ret == -1) {
+ close(fd);
+ return -EFAULT;
+ }
+
+ close(fd);
+
+ switch (ethtool_cmd_speed(&edata)) {
+ case SPEED_10:
+ dev->data->dev_link.link_speed = ETH_SPEED_NUM_10M;
+ break;
+ case SPEED_100:
+ dev->data->dev_link.link_speed = ETH_SPEED_NUM_100M;
+ break;
+ case SPEED_1000:
+ dev->data->dev_link.link_speed = ETH_SPEED_NUM_1G;
+ break;
+ case SPEED_2500:
+ dev->data->dev_link.link_speed = ETH_SPEED_NUM_2_5G;
+ break;
+ default:
+ dev->data->dev_link.link_speed = ETH_SPEED_NUM_NONE;
+ }
+
+ dev->data->dev_link.link_duplex = edata.duplex ? ETH_LINK_FULL_DUPLEX :
+ ETH_LINK_HALF_DUPLEX;
+ dev->data->dev_link.link_autoneg = edata.autoneg ? ETH_LINK_AUTONEG :
+ ETH_LINK_FIXED;
+
+ neta_ppio_get_link_state(priv->ppio, &link_up);
+ dev->data->dev_link.link_status = link_up ? ETH_LINK_UP : ETH_LINK_DOWN;
+
+ return 0;
+}
+
+/**
* DPDK callback to set the primary MAC address.
*
* @param dev
@@ -1412,7 +1559,9 @@ static const struct eth_dev_ops mvneta_ops = {
.dev_set_link_up = mvneta_dev_set_link_up,
.dev_set_link_down = mvneta_dev_set_link_down,
.dev_close = mvneta_dev_close,
+ .link_update = mvneta_link_update,
.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
next prev parent reply other threads:[~2018-08-31 12:26 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-28 15:10 [dpdk-dev] [PATCH 0/8] Add Marvell NETA PMD Andrzej Ostruszka
2018-08-28 15:10 ` [dpdk-dev] [PATCH 1/8] net/mvneta: add neta PMD skeleton Andrzej Ostruszka
2018-08-30 8:42 ` Hemant
2018-08-30 9:54 ` Andrzej Ostruszka
2018-08-28 15:10 ` [dpdk-dev] [PATCH 2/8] net/mvneta: add Rx/Tx support Andrzej Ostruszka
2018-08-28 15:10 ` [dpdk-dev] [PATCH 3/8] net/mvneta: support for setting of MTU Andrzej Ostruszka
2018-08-28 15:10 ` [dpdk-dev] [PATCH 4/8] net/mvneta: add link update Andrzej Ostruszka
2018-08-28 15:10 ` [dpdk-dev] [PATCH 5/8] net/mvneta: support for promiscuous Andrzej Ostruszka
2018-08-28 15:10 ` [dpdk-dev] [PATCH 6/8] net/mvneta: add MAC filtering Andrzej Ostruszka
2018-08-28 15:10 ` [dpdk-dev] [PATCH 7/8] net/mvneta: add support for basic stats Andrzej Ostruszka
2018-08-28 15:10 ` [dpdk-dev] [PATCH 8/8] net/mvneta: add reset statistics callback Andrzej Ostruszka
2018-08-31 12:25 ` [dpdk-dev] [PATCH v2 0/8] Add Marvell NETA PMD Andrzej Ostruszka
2018-08-31 12:25 ` [dpdk-dev] [PATCH v2 1/8] net/bonding: fix buf corruption in packets Andrzej Ostruszka
2018-08-31 12:33 ` Andrzej Ostruszka
2018-08-31 12:25 ` [dpdk-dev] [PATCH v2 1/8] net/mvneta: add neta PMD skeleton Andrzej Ostruszka
2018-08-31 12:25 ` [dpdk-dev] [PATCH v2 2/8] " Andrzej Ostruszka
2018-08-31 12:26 ` [dpdk-dev] [PATCH v2 2/8] net/mvneta: add Rx/Tx support Andrzej Ostruszka
2018-08-31 12:26 ` [dpdk-dev] [PATCH v2 3/8] " Andrzej Ostruszka
2018-08-31 12:26 ` [dpdk-dev] [PATCH v2 3/8] net/mvneta: support for setting of MTU Andrzej Ostruszka
2018-08-31 12:26 ` [dpdk-dev] [PATCH v2 4/8] net/mvneta: add link update Andrzej Ostruszka
2018-08-31 12:26 ` Andrzej Ostruszka [this message]
2018-08-31 12:26 ` [dpdk-dev] [PATCH v2 5/8] net/mvneta: support for promiscuous Andrzej Ostruszka
2018-08-31 12:26 ` [dpdk-dev] [PATCH v2 6/8] net/mvneta: add MAC filtering Andrzej Ostruszka
2018-08-31 12:26 ` [dpdk-dev] [PATCH v2 7/8] net/mvneta: add support for basic stats Andrzej Ostruszka
2018-08-31 12:26 ` [dpdk-dev] [PATCH v2 8/8] net/mvneta: add reset statistics callback Andrzej Ostruszka
2018-08-31 12:59 ` [dpdk-dev] [PATCH v3 0/8] Add Marvell NETA PMD Andrzej Ostruszka
2018-08-31 12:59 ` [dpdk-dev] [PATCH v3 1/8] net/mvneta: add neta PMD skeleton Andrzej Ostruszka
2018-09-14 16:23 ` Ferruh Yigit
2018-09-19 15:14 ` Andrzej Ostruszka
2018-09-19 17:38 ` Ferruh Yigit
2018-08-31 12:59 ` [dpdk-dev] [PATCH v3 2/8] net/mvneta: add Rx/Tx support Andrzej Ostruszka
2018-09-14 16:24 ` Ferruh Yigit
2018-08-31 12:59 ` [dpdk-dev] [PATCH v3 3/8] net/mvneta: support for setting of MTU Andrzej Ostruszka
2018-08-31 12:59 ` [dpdk-dev] [PATCH v3 4/8] net/mvneta: add link update Andrzej Ostruszka
2018-08-31 12:59 ` [dpdk-dev] [PATCH v3 5/8] net/mvneta: support for promiscuous Andrzej Ostruszka
2018-08-31 12:59 ` [dpdk-dev] [PATCH v3 6/8] net/mvneta: add MAC filtering Andrzej Ostruszka
2018-09-14 16:24 ` Ferruh Yigit
2018-08-31 12:59 ` [dpdk-dev] [PATCH v3 7/8] net/mvneta: add support for basic stats Andrzej Ostruszka
2018-08-31 12:59 ` [dpdk-dev] [PATCH v3 8/8] net/mvneta: add reset statistics callback Andrzej Ostruszka
2018-09-10 6:11 ` [dpdk-dev] [PATCH v3 0/8] Add Marvell NETA PMD Andrzej Ostruszka
2018-09-14 16:20 ` Ferruh Yigit
2018-09-19 15:07 ` Andrzej Ostruszka
2018-09-19 17:39 ` Ferruh Yigit
2018-09-21 11:59 ` Andrzej Ostruszka
2018-09-21 13:37 ` Ferruh Yigit
2018-09-19 15:01 ` [dpdk-dev] [PATCH v4 " Andrzej Ostruszka
2018-09-19 15:01 ` [dpdk-dev] [PATCH v4 1/8] net/mvneta: add neta PMD skeleton Andrzej Ostruszka
2018-09-19 16:19 ` Stephen Hemminger
2018-09-20 7:45 ` Andrzej Ostruszka
2018-09-19 16:28 ` Stephen Hemminger
2018-09-20 7:57 ` Andrzej Ostruszka
2018-09-19 15:01 ` [dpdk-dev] [PATCH v4 2/8] net/mvneta: add Rx/Tx support Andrzej Ostruszka
2018-09-19 15:01 ` [dpdk-dev] [PATCH v4 3/8] net/mvneta: support for setting of MTU Andrzej Ostruszka
2018-09-19 15:01 ` [dpdk-dev] [PATCH v4 4/8] net/mvneta: add link update Andrzej Ostruszka
2018-09-19 15:01 ` [dpdk-dev] [PATCH v4 5/8] net/mvneta: support for promiscuous Andrzej Ostruszka
2018-09-19 15:01 ` [dpdk-dev] [PATCH v4 6/8] net/mvneta: add MAC filtering Andrzej Ostruszka
2018-09-19 15:01 ` [dpdk-dev] [PATCH v4 7/8] net/mvneta: add support for basic stats Andrzej Ostruszka
2018-09-19 15:01 ` [dpdk-dev] [PATCH v4 8/8] net/mvneta: add reset statistics callback Andrzej Ostruszka
2018-09-20 9:05 ` [dpdk-dev] [PATCH v5 0/8] Add Marvell NETA PMD Andrzej Ostruszka
2018-09-20 9:05 ` [dpdk-dev] [PATCH v5 1/8] net/mvneta: add neta PMD skeleton Andrzej Ostruszka
2018-09-24 9:21 ` Ferruh Yigit
2018-09-24 9:35 ` Ferruh Yigit
2018-09-24 9:38 ` Ferruh Yigit
2018-10-01 9:35 ` Andrzej Ostruszka
2018-09-24 9:57 ` Ferruh Yigit
2018-09-24 10:03 ` Ferruh Yigit
2018-10-01 9:30 ` Andrzej Ostruszka
2018-09-20 9:05 ` [dpdk-dev] [PATCH v5 2/8] net/mvneta: add Rx/Tx support Andrzej Ostruszka
2018-09-20 9:05 ` [dpdk-dev] [PATCH v5 3/8] net/mvneta: support for setting of MTU Andrzej Ostruszka
2018-09-20 9:05 ` [dpdk-dev] [PATCH v5 4/8] net/mvneta: add link update Andrzej Ostruszka
2018-09-20 9:05 ` [dpdk-dev] [PATCH v5 5/8] net/mvneta: support for promiscuous Andrzej Ostruszka
2018-09-20 9:05 ` [dpdk-dev] [PATCH v5 6/8] net/mvneta: add MAC filtering Andrzej Ostruszka
2018-09-20 9:05 ` [dpdk-dev] [PATCH v5 7/8] net/mvneta: add support for basic stats Andrzej Ostruszka
2018-09-20 9:05 ` [dpdk-dev] [PATCH v5 8/8] net/mvneta: add reset statistics callback Andrzej Ostruszka
2018-10-01 9:26 ` [dpdk-dev] [PATCH v6 0/8] Add Marvell NETA PMD Andrzej Ostruszka
2018-10-01 9:26 ` [dpdk-dev] [PATCH v6 1/8] net/mvneta: add neta PMD skeleton Andrzej Ostruszka
2018-10-02 11:53 ` Ferruh Yigit
2018-10-01 9:26 ` [dpdk-dev] [PATCH v6 2/8] net/mvneta: add Rx/Tx support Andrzej Ostruszka
2018-10-02 11:54 ` Ferruh Yigit
2018-10-01 9:26 ` [dpdk-dev] [PATCH v6 3/8] net/mvneta: support for setting of MTU Andrzej Ostruszka
2018-10-01 9:26 ` [dpdk-dev] [PATCH v6 4/8] net/mvneta: add link update Andrzej Ostruszka
2018-10-01 9:26 ` [dpdk-dev] [PATCH v6 5/8] net/mvneta: support for promiscuous Andrzej Ostruszka
2018-10-01 9:26 ` [dpdk-dev] [PATCH v6 6/8] net/mvneta: add MAC filtering Andrzej Ostruszka
2018-10-01 9:26 ` [dpdk-dev] [PATCH v6 7/8] net/mvneta: add support for basic stats Andrzej Ostruszka
2018-10-01 9:26 ` [dpdk-dev] [PATCH v6 8/8] net/mvneta: add reset statistics callback Andrzej Ostruszka
2018-10-03 7:22 ` [dpdk-dev] [PATCH v7 0/8] Add Marvell NETA PMD Andrzej Ostruszka
2018-10-03 7:22 ` [dpdk-dev] [PATCH v7 1/8] net/mvneta: add neta PMD skeleton Andrzej Ostruszka
2018-10-03 7:22 ` [dpdk-dev] [PATCH v7 2/8] net/mvneta: add Rx/Tx support Andrzej Ostruszka
2018-10-03 7:22 ` [dpdk-dev] [PATCH v7 3/8] net/mvneta: support for setting of MTU Andrzej Ostruszka
2018-10-03 7:22 ` [dpdk-dev] [PATCH v7 4/8] net/mvneta: add link update Andrzej Ostruszka
2018-10-03 7:22 ` [dpdk-dev] [PATCH v7 5/8] net/mvneta: support for promiscuous Andrzej Ostruszka
2018-10-03 7:22 ` [dpdk-dev] [PATCH v7 6/8] net/mvneta: add MAC filtering Andrzej Ostruszka
2018-10-03 7:22 ` [dpdk-dev] [PATCH v7 7/8] net/mvneta: add support for basic stats Andrzej Ostruszka
2018-10-03 7:22 ` [dpdk-dev] [PATCH v7 8/8] net/mvneta: add reset statistics callback Andrzej Ostruszka
2018-10-03 13:25 ` [dpdk-dev] [PATCH v7 0/8] Add Marvell NETA PMD Ferruh Yigit
2018-10-03 19:46 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1535718368-15803-9-git-send-email-amo@semihalf.com \
--to=amo@semihalf.com \
--cc=dev@dpdk.org \
--cc=mw@semihalf.com \
--cc=nsamsono@marvell.com \
--cc=tdu@semihalf.com \
--cc=zr@semihalf.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).