Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/52087/?format=api
{ "id": 52087, "url": "http://patches.dpdk.org/api/patches/52087/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1554197324-32391-9-git-send-email-arybchenko@solarflare.com/", "project": { "id": 1, "url": "http://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": "<1554197324-32391-9-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1554197324-32391-9-git-send-email-arybchenko@solarflare.com", "date": "2019-04-02T09:28:40", "name": "[08/12] net/sfc: introduce descriptor space check in Tx prepare", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "da247486344da96ac02462ba94a8b7efdd325996", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1554197324-32391-9-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 4050, "url": "http://patches.dpdk.org/api/series/4050/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4050", "date": "2019-04-02T09:28:33", "name": "net/sfc: add Tx prepare and encapsulated TSO", "version": 1, "mbox": "http://patches.dpdk.org/series/4050/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/52087/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/52087/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 8D7615F24;\n\tTue, 2 Apr 2019 11:29:24 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n\t[148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 713894C91\n\tfor <dev@dpdk.org>; Tue, 2 Apr 2019 11:29:05 +0200 (CEST)", "from webmail.solarflare.com (webmail.solarflare.com\n\t[12.187.104.26])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby mx1-us1.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with\n\tESMTPS id 9B13510007E; Tue, 2 Apr 2019 09:28:58 +0000 (UTC)", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1395.4; Tue, 2 Apr 2019 02:28:55 -0700", "from opal.uk.solarflarecom.com (10.17.10.1) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id\n\t15.0.1395.4 via Frontend Transport; Tue, 2 Apr 2019 02:28:55 -0700", "from ukv-loginhost.uk.solarflarecom.com\n\t(ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tx329Sr4n028272; Tue, 2 Apr 2019 10:28:53 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n\tby ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id\n\tE77DF161612; Tue, 2 Apr 2019 10:28:53 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Igor Romanov <igor.romanov@oktetlabs.ru>", "Date": "Tue, 2 Apr 2019 10:28:40 +0100", "Message-ID": "<1554197324-32391-9-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1554197324-32391-1-git-send-email-arybchenko@solarflare.com>", "References": "<1554197324-32391-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.5.1010-24526.005", "X-TM-AS-Result": "No-10.473600-4.000000-10", "X-TMASE-MatchedRID": "BgWyh4+V8QQPRVepDWIjx0hwlOfYeSqxgRykyfrH1xkJW4Re2U2py9GX\n\tgQphHQmx09NQNrxIpFYBtjkcfRMmqTIRhSUG+oeicYGYuKj6YmB/r8x3wtvaX3aMP8m6qk6ShEs\n\tPoifR3f3nsHGifULMdNMKNgYnbS2Jlh5qb5HiiQfMZk86HxFjjqX1XMd/Sqvu1gisw2JKo8lrF3\n\tzE72icb6lVr7hWmDw8xmzLko6q/sDrbAOAP87o65A6S0SjvcYUndls9F9zmi2bKItl61J/yZ+in\n\tTK0bC9eKrauXd3MZDV4aBaaKovc7xrm++wprvj/AmY0g1U/u2qRPsFNokFWItCKIk8e+w4t", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--10.473600-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24526.005", "X-MDID": "1554197339-5kzl_OWs7OS5", "Subject": "[dpdk-dev] [PATCH 08/12] net/sfc: introduce descriptor space check\n\tin Tx prepare", "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: Igor Romanov <igor.romanov@oktetlabs.ru>\n\nAdd descriptor space check to Tx prepare function to inform a caller\nthat a packet that needs more than maximum Tx descriptors of a queue\ncan not be sent.\n\nSigned-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/sfc_dp_tx.h | 31 ++++++++++++++++++++++++++++++-\n drivers/net/sfc/sfc_ef10_tx.c | 4 +++-\n drivers/net/sfc/sfc_tx.c | 9 ++++++++-\n 3 files changed, 41 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc_dp_tx.h b/drivers/net/sfc/sfc_dp_tx.h\nindex c42d0d01f..ebc941857 100644\n--- a/drivers/net/sfc/sfc_dp_tx.h\n+++ b/drivers/net/sfc/sfc_dp_tx.h\n@@ -196,8 +196,13 @@ const struct sfc_dp_tx *sfc_dp_tx_by_dp_txq(const struct sfc_dp_txq *dp_txq);\n \n static inline int\n sfc_dp_tx_prepare_pkt(struct rte_mbuf *m,\n-\t\t\t uint32_t tso_tcp_header_offset_limit)\n+\t\t\t uint32_t tso_tcp_header_offset_limit,\n+\t\t\t unsigned int max_fill_level,\n+\t\t\t unsigned int nb_tso_descs,\n+\t\t\t unsigned int nb_vlan_descs)\n {\n+\tunsigned int descs_required = m->nb_segs;\n+\n #ifdef RTE_LIBRTE_SFC_EFX_DEBUG\n \tint ret;\n \n@@ -214,11 +219,35 @@ sfc_dp_tx_prepare_pkt(struct rte_mbuf *m,\n \n \tif (m->ol_flags & PKT_TX_TCP_SEG) {\n \t\tunsigned int tcph_off = m->l2_len + m->l3_len;\n+\t\tunsigned int header_len = tcph_off + m->l4_len;\n \n \t\tif (unlikely(tcph_off > tso_tcp_header_offset_limit))\n \t\t\treturn EINVAL;\n+\n+\t\tdescs_required += nb_tso_descs;\n+\n+\t\t/*\n+\t\t * Extra descriptor that is required when a packet header\n+\t\t * is separated from remaining content of the first segment.\n+\t\t */\n+\t\tif (rte_pktmbuf_data_len(m) > header_len)\n+\t\t\tdescs_required++;\n \t}\n \n+\t/*\n+\t * The number of VLAN descriptors is added regardless of requested\n+\t * VLAN offload since VLAN is sticky and sending packet without VLAN\n+\t * insertion may require VLAN descriptor to reset the sticky to 0.\n+\t */\n+\tdescs_required += nb_vlan_descs;\n+\n+\t/*\n+\t * Max fill level must be sufficient to hold all required descriptors\n+\t * to send the packet entirely.\n+\t */\n+\tif (descs_required > max_fill_level)\n+\t\treturn ENOBUFS;\n+\n \treturn 0;\n }\n \ndiff --git a/drivers/net/sfc/sfc_ef10_tx.c b/drivers/net/sfc/sfc_ef10_tx.c\nindex 3d6ba4292..e7ab993dd 100644\n--- a/drivers/net/sfc/sfc_ef10_tx.c\n+++ b/drivers/net/sfc/sfc_ef10_tx.c\n@@ -349,7 +349,9 @@ sfc_ef10_prepare_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t}\n #endif\n \t\tret = sfc_dp_tx_prepare_pkt(m,\n-\t\t\t\ttxq->tso_tcp_header_offset_limit);\n+\t\t\t\ttxq->tso_tcp_header_offset_limit,\n+\t\t\t\ttxq->max_fill_level,\n+\t\t\t\tSFC_EF10_TSO_OPT_DESCS_NUM, 0);\n \t\tif (unlikely(ret != 0)) {\n \t\t\trte_errno = ret;\n \t\t\tbreak;\ndiff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c\nindex e128bff90..4037802e6 100644\n--- a/drivers/net/sfc/sfc_tx.c\n+++ b/drivers/net/sfc/sfc_tx.c\n@@ -709,8 +709,15 @@ sfc_efx_prepare_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \tfor (i = 0; i < nb_pkts; i++) {\n \t\tint ret;\n \n+\t\t/*\n+\t\t * EFX Tx datapath may require extra VLAN descriptor if VLAN\n+\t\t * insertion offload is requested regardless the offload\n+\t\t * requested/supported.\n+\t\t */\n \t\tret = sfc_dp_tx_prepare_pkt(tx_pkts[i],\n-\t\t\t\tencp->enc_tx_tso_tcp_header_offset_limit);\n+\t\t\t\tencp->enc_tx_tso_tcp_header_offset_limit,\n+\t\t\t\ttxq->max_fill_level, EFX_TX_FATSOV2_OPT_NDESCS,\n+\t\t\t\t1);\n \t\tif (unlikely(ret != 0)) {\n \t\t\trte_errno = ret;\n \t\t\tbreak;\n", "prefixes": [ "08/12" ] }