Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/45296/?format=api
{ "id": 45296, "url": "https://patches.dpdk.org/api/patches/45296/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1537859109-25659-9-git-send-email-amo@semihalf.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1537859109-25659-9-git-send-email-amo@semihalf.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1537859109-25659-9-git-send-email-amo@semihalf.com", "date": "2018-09-25T07:05:04", "name": "[v3,08/13] net/mvpp2: update MTU and MRU related calculations", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "b8b160e8ef091dc47565e909a425df344ccd1e1f", "submitter": { "id": 1112, "url": "https://patches.dpdk.org/api/people/1112/?format=api", "name": "Andrzej Ostruszka", "email": "amo@semihalf.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1537859109-25659-9-git-send-email-amo@semihalf.com/mbox/", "series": [ { "id": 1482, "url": "https://patches.dpdk.org/api/series/1482/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=1482", "date": "2018-09-25T07:04:56", "name": "net/mvpp2: add new features", "version": 3, "mbox": "https://patches.dpdk.org/series/1482/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/45296/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/45296/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 612BE4F91;\n\tTue, 25 Sep 2018 09:05:54 +0200 (CEST)", "from mail-lj1-f194.google.com (mail-lj1-f194.google.com\n\t[209.85.208.194]) by dpdk.org (Postfix) with ESMTP id 7CEB71E34\n\tfor <dev@dpdk.org>; Tue, 25 Sep 2018 09:05:21 +0200 (CEST)", "by mail-lj1-f194.google.com with SMTP id f8-v6so20644957ljk.1\n\tfor <dev@dpdk.org>; Tue, 25 Sep 2018 00:05:21 -0700 (PDT)", "from amok.semihalf.local (31-172-191-173.noc.fibertech.net.pl.\n\t[31.172.191.173]) by smtp.googlemail.com with ESMTPSA id\n\t24-v6sm238306ljb.76.2018.09.25.00.05.19\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 25 Sep 2018 00:05:19 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=semihalf-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=Lq2A20v6d+3qvNXSF2sBgr6zAeGZATPNRfTZYtVXC6U=;\n\tb=AX7y0sKbFWEjIRsNwpQof7mKTlnS4Sb+qrDA1KF1NMgz4LcV4QGEfHtElWFwEkyYHV\n\tcXh6vZmadmKYMzIKGZYc+1g7KOOGzqfMc49oo3W3T1L7/8UQz4cC8qjTgkwmznEHztjw\n\t79GqDMM+YfF338d54vD1O74xVQ+m5xS3MQo/dBDlDQ+nvwqknMF1lBrCPlsuemoIad1u\n\tiOvnAaiPlRvu9v2q0vDnDa0zZOAbkLdog9PrhDuTwoWPSsjaMNpQAbsxA7yoCvQXlnJo\n\tU+LNlDeIqYxbmcuUersR6hNqOLuqrCr0wPnJnoy4zfTSWFqlzcS8HK0Ce0ktGcu2K64D\n\tIpXQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=Lq2A20v6d+3qvNXSF2sBgr6zAeGZATPNRfTZYtVXC6U=;\n\tb=lo0X9hlBUe2YH3ir4jdIvb1yKjsRFDKDIgnR81j11XJ/0p5JSwaR4PvuaKXLFOIjwp\n\tZfrkUivp2dosVylmryDku897u+I10OoSMrr7kiFDwnmlHSU51ae482Lq9yYOYmFbUuOs\n\tHNvW4H2p3A9nrLfYsksoDNF6rvtWqsadJx78TFQd5AUQLJyYrcEjebRamHWlH8g+GU+E\n\tU+TnDcZeaTbd8PrRD5IYI4y8BsGZPvWqFHr4+MrSKunm8OvftUKvDUhBQAnXDnql1uAZ\n\tje/+jQk2irXOu+qsNx+nSCkuCY6PVVXQ4DNhr+Qh+UkRGWVZsmqPbqNbTycjoM+1cqjJ\n\tsj+A==", "X-Gm-Message-State": "ABuFfoiGVMbPM+K8b4XF/sB0htlrdin17vrw5M2ghXRD0fH3cq40mi3p\n\t+MaJaslLqNj6kU0ak6BpBH6Faaov34YLWQ==", "X-Google-Smtp-Source": "ACcGV61SsovtUUVtCjfomWl3zjlpyOGQf6WCaIOQL7TC/cYYc6ZTVsmCOJfh+L8Ccz/TQPRptuD/pw==", "X-Received": "by 2002:a2e:4619:: with SMTP id\n\tt25-v6mr1615256lja.96.1537859120848; \n\tTue, 25 Sep 2018 00:05:20 -0700 (PDT)", "From": "Andrzej Ostruszka <amo@semihalf.com>", "To": "dev@dpdk.org", "Cc": "mw@semihalf.com, nadavh@marvell.com,\n\tNatalie 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>\n\t<1537859109-25659-1-git-send-email-amo@semihalf.com>", "Subject": "[dpdk-dev] [PATCH v3 08/13] net/mvpp2: update MTU and MRU related\n\tcalculations", "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>,\n\t<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>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Natalie Samsonov <nsamsono@marvell.com>\n\nThis commit updates MTU and MRU related calculations.\n\nSigned-off-by: Natalie Samsonov <nsamsono@marvell.com>\nReviewed-by: Yelena Krivosheev <yelena@marvell.com>\nReviewed-by: Dmitri Epshtein <dima@marvell.com>\n---\n drivers/net/mvpp2/mrvl_ethdev.c | 70 +++++++++++++++++++++++++++++++----------\n drivers/net/mvpp2/mrvl_ethdev.h | 7 +++++\n 2 files changed, 61 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c\nindex 64c6f0f..24bd0a5 100644\n--- a/drivers/net/mvpp2/mrvl_ethdev.c\n+++ b/drivers/net/mvpp2/mrvl_ethdev.c\n@@ -316,7 +316,7 @@ mrvl_dev_configure(struct rte_eth_dev *dev)\n \n \tif (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME)\n \t\tdev->data->mtu = dev->data->dev_conf.rxmode.max_rx_pkt_len -\n-\t\t\t\t ETHER_HDR_LEN - ETHER_CRC_LEN;\n+\t\t\t\t MRVL_PP2_ETH_HDRS_LEN;\n \n \tret = mrvl_configure_rxqs(priv, dev->data->port_id,\n \t\t\t\t dev->data->nb_rx_queues);\n@@ -366,21 +366,55 @@ static int\n mrvl_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)\n {\n \tstruct mrvl_priv *priv = dev->data->dev_private;\n-\t/* extra MV_MH_SIZE bytes are required for Marvell tag */\n-\tuint16_t mru = mtu + MV_MH_SIZE + ETHER_HDR_LEN + ETHER_CRC_LEN;\n+\tuint16_t mru;\n+\tuint16_t mbuf_data_size = 0; /* SW buffer size */\n \tint ret;\n \n-\tif (mtu < ETHER_MIN_MTU || mru > MRVL_PKT_SIZE_MAX)\n+\tmru = MRVL_PP2_MTU_TO_MRU(mtu);\n+\t/*\n+\t * min_rx_buf_size is equal to mbuf data size\n+\t * if pmd didn't set it differently\n+\t */\n+\tmbuf_data_size = dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM;\n+\t/* Prevent PMD from:\n+\t * - setting mru greater than the mbuf size resulting in\n+\t * hw and sw buffer size mismatch\n+\t * - setting mtu that requires the support of scattered packets\n+\t * when this feature has not been enabled/supported so far\n+\t * (TODO check scattered_rx flag here once scattered RX is supported).\n+\t */\n+\tif (mru + MRVL_PKT_OFFS > mbuf_data_size) {\n+\t\tmru = mbuf_data_size - MRVL_PKT_OFFS;\n+\t\tmtu = MRVL_PP2_MRU_TO_MTU(mru);\n+\t\tMRVL_LOG(WARNING, \"MTU too big, max MTU possible limitted \"\n+\t\t\t\"by current mbuf size: %u. Set MTU to %u, MRU to %u\",\n+\t\t\tmbuf_data_size, mtu, mru);\n+\t}\n+\n+\tif (mtu < ETHER_MIN_MTU || mru > MRVL_PKT_SIZE_MAX) {\n+\t\tMRVL_LOG(ERR, \"Invalid MTU [%u] or MRU [%u]\", mtu, mru);\n \t\treturn -EINVAL;\n+\t}\n+\n+\tdev->data->mtu = mtu;\n+\tdev->data->dev_conf.rxmode.max_rx_pkt_len = mru - MV_MH_SIZE;\n \n \tif (!priv->ppio)\n \t\treturn 0;\n \n \tret = pp2_ppio_set_mru(priv->ppio, mru);\n-\tif (ret)\n+\tif (ret) {\n+\t\tMRVL_LOG(ERR, \"Failed to change MRU\");\n \t\treturn ret;\n+\t}\n+\n+\tret = pp2_ppio_set_mtu(priv->ppio, mtu);\n+\tif (ret) {\n+\t\tMRVL_LOG(ERR, \"Failed to change MTU\");\n+\t\treturn ret;\n+\t}\n \n-\treturn pp2_ppio_set_mtu(priv->ppio, mtu);\n+\treturn 0;\n }\n \n /**\n@@ -591,6 +625,9 @@ mrvl_dev_start(struct rte_eth_dev *dev)\n \t\t}\n \t\tpriv->vlan_flushed = 1;\n \t}\n+\tret = mrvl_mtu_set(dev, dev->data->mtu);\n+\tif (ret)\n+\t\tMRVL_LOG(ERR, \"Failed to set MTU to %d\", dev->data->mtu);\n \n \t/* For default QoS config, don't start classifier. */\n \tif (mrvl_qos_cfg &&\n@@ -1542,8 +1579,8 @@ mrvl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n {\n \tstruct mrvl_priv *priv = dev->data->dev_private;\n \tstruct mrvl_rxq *rxq;\n-\tuint32_t min_size,\n-\t\t max_rx_pkt_len = dev->data->dev_conf.rxmode.max_rx_pkt_len;\n+\tuint32_t frame_size, buf_size = rte_pktmbuf_data_room_size(mp);\n+\tuint32_t max_rx_pkt_len = dev->data->dev_conf.rxmode.max_rx_pkt_len;\n \tint ret, tc, inq;\n \tuint64_t offloads;\n \n@@ -1558,15 +1595,16 @@ mrvl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n \t\treturn -EFAULT;\n \t}\n \n-\tmin_size = rte_pktmbuf_data_room_size(mp) - RTE_PKTMBUF_HEADROOM -\n-\t\t MRVL_PKT_EFFEC_OFFS;\n-\tif (min_size < max_rx_pkt_len) {\n-\t\tMRVL_LOG(ERR,\n-\t\t\t\"Mbuf size must be increased to %u bytes to hold up to %u bytes of data.\",\n-\t\t\tmax_rx_pkt_len + RTE_PKTMBUF_HEADROOM +\n-\t\t\tMRVL_PKT_EFFEC_OFFS,\n+\tframe_size = buf_size - RTE_PKTMBUF_HEADROOM - MRVL_PKT_EFFEC_OFFS;\n+\tif (frame_size < max_rx_pkt_len) {\n+\t\tMRVL_LOG(WARNING,\n+\t\t\t\"Mbuf size must be increased to %u bytes to hold up \"\n+\t\t\t\"to %u bytes of data.\",\n+\t\t\tbuf_size + max_rx_pkt_len - frame_size,\n \t\t\tmax_rx_pkt_len);\n-\t\treturn -EINVAL;\n+\t\tdev->data->dev_conf.rxmode.max_rx_pkt_len = frame_size;\n+\t\tMRVL_LOG(INFO, \"Setting max rx pkt len to %u\",\n+\t\t\tdev->data->dev_conf.rxmode.max_rx_pkt_len);\n \t}\n \n \tif (dev->data->rx_queues[idx]) {\ndiff --git a/drivers/net/mvpp2/mrvl_ethdev.h b/drivers/net/mvpp2/mrvl_ethdev.h\nindex 984f31e..f0ae983 100644\n--- a/drivers/net/mvpp2/mrvl_ethdev.h\n+++ b/drivers/net/mvpp2/mrvl_ethdev.h\n@@ -72,6 +72,13 @@\n /** Minimum number of sent buffers to release from shadow queue to BM */\n #define MRVL_PP2_BUF_RELEASE_BURST_SIZE\t64\n \n+#define MRVL_PP2_VLAN_TAG_LEN\t\t4\n+#define MRVL_PP2_ETH_HDRS_LEN\t\t(ETHER_HDR_LEN + ETHER_CRC_LEN + \\\n+\t\t\t\t\t(2 * MRVL_PP2_VLAN_TAG_LEN))\n+#define MRVL_PP2_HDRS_LEN\t\t(MV_MH_SIZE + MRVL_PP2_ETH_HDRS_LEN)\n+#define MRVL_PP2_MTU_TO_MRU(mtu)\t((mtu) + MRVL_PP2_HDRS_LEN)\n+#define MRVL_PP2_MRU_TO_MTU(mru)\t((mru) - MRVL_PP2_HDRS_LEN)\n+\n /** Maximum length of a match string */\n #define MRVL_MATCH_LEN 16\n \n", "prefixes": [ "v3", "08/13" ] }