Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 17332,
    "url": "http://patches.dpdk.org/api/patches/17332/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1480436367-20749-47-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": "<1480436367-20749-47-git-send-email-arybchenko@solarflare.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1480436367-20749-47-git-send-email-arybchenko@solarflare.com",
    "date": "2016-11-29T16:19:18",
    "name": "[dpdk-dev,v2,46/55] net/sfc: calculate Rx buffer size which may be used",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "098bf4c6d65e71cbbac25be38852bd57c63ab9c7",
    "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/1480436367-20749-47-git-send-email-arybchenko@solarflare.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/17332/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/17332/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 6ECC2FB24;\n\tTue, 29 Nov 2016 17:23:12 +0100 (CET)",
            "from nbfkord-smmo02.seg.att.com (nbfkord-smmo02.seg.att.com\n\t[209.65.160.78]) by dpdk.org (Postfix) with ESMTP id 250855583\n\tfor <dev@dpdk.org>; Tue, 29 Nov 2016 17:21:02 +0100 (CET)",
            "from unknown [12.187.104.26] (EHLO nbfkord-smmo02.seg.att.com)\n\tby nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with ESMTP id\n\tfeaad385.2b928162e940.1895581.00-2461.4144501.nbfkord-smmo02.seg.att.com\n\t(envelope-from <arybchenko@solarflare.com>); \n\tTue, 29 Nov 2016 16:21:03 +0000 (UTC)",
            "from unknown [12.187.104.26]\n\tby nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with SMTP id\n\tceaad385.0.1895549.00-2371.4144492.nbfkord-smmo02.seg.att.com\n\t(envelope-from <arybchenko@solarflare.com>); \n\tTue, 29 Nov 2016 16:21:01 +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.1044.25; Tue, 29 Nov 2016 08:20:26 -0800",
            "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.1044.25 via Frontend Transport; Tue, 29 Nov 2016 08:20:25 -0800",
            "from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com\n\t[10.17.10.10])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tuATGKOHE030036; Tue, 29 Nov 2016 16:20:24 GMT",
            "from uklogin.uk.solarflarecom.com (localhost.localdomain\n\t[127.0.0.1])\n\tby uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tuATGKM1s021233; Tue, 29 Nov 2016 16:20:24 GMT"
        ],
        "X-MXL-Hash": [
            "583daaef07235f1b-c30a1132411275dcb99d4a22367f9324d1567db2",
            "583daaed1f65438c-d22b107d5fd1d02d950faf40a3b0856d17f48be8"
        ],
        "From": "Andrew Rybchenko <arybchenko@solarflare.com>",
        "To": "<dev@dpdk.org>",
        "CC": "<ferruh.yigit@intel.com>",
        "Date": "Tue, 29 Nov 2016 16:19:18 +0000",
        "Message-ID": "<1480436367-20749-47-git-send-email-arybchenko@solarflare.com>",
        "X-Mailer": "git-send-email 1.8.2.3",
        "In-Reply-To": "<1480436367-20749-1-git-send-email-arybchenko@solarflare.com>",
        "References": "<1479740470-6723-1-git-send-email-arybchenko@solarflare.com>\n\t<1480436367-20749-1-git-send-email-arybchenko@solarflare.com>",
        "MIME-Version": "1.0",
        "Content-Type": "text/plain",
        "X-AnalysisOut": [
            "[v=2.1 cv=UI/baXry c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==]",
            "[:17 a=L24OOQBejmoA:10 a=zRKbQ67AAAAA:8 a=FQDJSoJozdtYI0us5]",
            "[v0A:9 a=bzdbxG0FR94lQyIv:21 a=7FTBPwsNuC0SmyQW:21 a=PA03WX]",
            "[8tBzeizutn5_OT:22]"
        ],
        "X-Spam": "[F=0.3141967984; CM=0.500; S=0.314(2015072901)]",
        "X-MAIL-FROM": "<arybchenko@solarflare.com>",
        "X-SOURCE-IP": "[12.187.104.26]",
        "Subject": "[dpdk-dev] [PATCH v2 46/55] net/sfc: calculate Rx buffer size which\n\tmay be used",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "patches and discussions about DPDK <dev.dpdk.org>",
        "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://dpdk.org/ml/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "Take Rx buffer start alignment and end-padding into account.\n\nReviewed-by: Andy Moreton <amoreton@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/sfc_rx.c | 110 +++++++++++++++++++++++++++++++++++++++++++++--\n drivers/net/sfc/sfc_rx.h |   1 +\n 2 files changed, 107 insertions(+), 4 deletions(-)",
    "diff": "diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c\nindex 00bcc9d..0a37776 100644\n--- a/drivers/net/sfc/sfc_rx.c\n+++ b/drivers/net/sfc/sfc_rx.c\n@@ -66,6 +66,106 @@ sfc_rx_qcheck_conf(struct sfc_adapter *sa,\n \treturn rc;\n }\n \n+static unsigned int\n+sfc_rx_mbuf_data_alignment(struct rte_mempool *mb_pool)\n+{\n+\tuint32_t data_off;\n+\tuint32_t order;\n+\n+\t/* The mbuf object itself is always cache line aligned */\n+\torder = rte_bsf32(RTE_CACHE_LINE_SIZE);\n+\n+\t/* Data offset from mbuf object start */\n+\tdata_off = sizeof(struct rte_mbuf) + rte_pktmbuf_priv_size(mb_pool) +\n+\t\tRTE_PKTMBUF_HEADROOM;\n+\n+\torder = MIN(order, rte_bsf32(data_off));\n+\n+\treturn 1u << (order - 1);\n+}\n+\n+static uint16_t\n+sfc_rx_mb_pool_buf_size(struct sfc_adapter *sa, struct rte_mempool *mb_pool)\n+{\n+\tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);\n+\tconst uint32_t nic_align_start = MAX(1, encp->enc_rx_buf_align_start);\n+\tconst uint32_t nic_align_end = MAX(1, encp->enc_rx_buf_align_end);\n+\tuint16_t buf_size;\n+\tunsigned int buf_aligned;\n+\tunsigned int start_alignment;\n+\tunsigned int end_padding_alignment;\n+\n+\t/* Below it is assumed that both alignments are power of 2 */\n+\tSFC_ASSERT(rte_is_power_of_2(nic_align_start));\n+\tSFC_ASSERT(rte_is_power_of_2(nic_align_end));\n+\n+\t/*\n+\t * mbuf is always cache line aligned, double-check\n+\t * that it meets rx buffer start alignment requirements.\n+\t */\n+\n+\t/* Start from mbuf pool data room size */\n+\tbuf_size = rte_pktmbuf_data_room_size(mb_pool);\n+\n+\t/* Remove headroom */\n+\tif (buf_size <= RTE_PKTMBUF_HEADROOM) {\n+\t\tsfc_err(sa,\n+\t\t\t\"RxQ mbuf pool %s object data room size %u is smaller than headroom %u\",\n+\t\t\tmb_pool->name, buf_size, RTE_PKTMBUF_HEADROOM);\n+\t\treturn 0;\n+\t}\n+\tbuf_size -= RTE_PKTMBUF_HEADROOM;\n+\n+\t/* Calculate guaranteed data start alignment */\n+\tbuf_aligned = sfc_rx_mbuf_data_alignment(mb_pool);\n+\n+\t/* Reserve space for start alignment */\n+\tif (buf_aligned < nic_align_start) {\n+\t\tstart_alignment = nic_align_start - buf_aligned;\n+\t\tif (buf_size <= start_alignment) {\n+\t\t\tsfc_err(sa,\n+\t\t\t\t\"RxQ mbuf pool %s object data room size %u is insufficient for headroom %u and buffer start alignment %u required by NIC\",\n+\t\t\t\tmb_pool->name,\n+\t\t\t\trte_pktmbuf_data_room_size(mb_pool),\n+\t\t\t\tRTE_PKTMBUF_HEADROOM, start_alignment);\n+\t\t\treturn 0;\n+\t\t}\n+\t\tbuf_aligned = nic_align_start;\n+\t\tbuf_size -= start_alignment;\n+\t} else {\n+\t\tstart_alignment = 0;\n+\t}\n+\n+\t/* Make sure that end padding does not write beyond the buffer */\n+\tif (buf_aligned < nic_align_end) {\n+\t\t/*\n+\t\t * Estimate space which can be lost. If guarnteed buffer\n+\t\t * size is odd, lost space is (nic_align_end - 1). More\n+\t\t * accurate formula is below.\n+\t\t */\n+\t\tend_padding_alignment = nic_align_end -\n+\t\t\tMIN(buf_aligned, 1u << (rte_bsf32(buf_size) - 1));\n+\t\tif (buf_size <= end_padding_alignment) {\n+\t\t\tsfc_err(sa,\n+\t\t\t\t\"RxQ mbuf pool %s object data room size %u is insufficient for headroom %u, buffer start alignment %u and end padding alignment %u required by NIC\",\n+\t\t\t\tmb_pool->name,\n+\t\t\t\trte_pktmbuf_data_room_size(mb_pool),\n+\t\t\t\tRTE_PKTMBUF_HEADROOM, start_alignment,\n+\t\t\t\tend_padding_alignment);\n+\t\t\treturn 0;\n+\t\t}\n+\t\tbuf_size -= end_padding_alignment;\n+\t} else {\n+\t\t/*\n+\t\t * Start is aligned the same or better than end,\n+\t\t * just align length.\n+\t\t */\n+\t\tbuf_size = P2ALIGN(buf_size, nic_align_end);\n+\t}\n+\n+\treturn buf_size;\n+}\n+\n int\n sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \t     uint16_t nb_rx_desc, unsigned int socket_id,\n@@ -73,6 +173,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \t     struct rte_mempool *mb_pool)\n {\n \tint rc;\n+\tuint16_t buf_size;\n \tstruct sfc_rxq_info *rxq_info;\n \tunsigned int evq_index;\n \tstruct sfc_evq *evq;\n@@ -82,10 +183,10 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \tif (rc != 0)\n \t\tgoto fail_bad_conf;\n \n-\tif (rte_pktmbuf_data_room_size(mb_pool) <= RTE_PKTMBUF_HEADROOM) {\n-\t\tsfc_err(sa, \"RxQ %u mbuf is too small, %u vs headroom %u\",\n-\t\t\tsw_index, rte_pktmbuf_data_room_size(mb_pool),\n-\t\t\tRTE_PKTMBUF_HEADROOM);\n+\tbuf_size = sfc_rx_mb_pool_buf_size(sa, mb_pool);\n+\tif (buf_size == 0) {\n+\t\tsfc_err(sa, \"RxQ %u mbuf pool object size is too small\",\n+\t\t\tsw_index);\n \t\tgoto fail_bad_conf;\n \t}\n \n@@ -126,6 +227,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \trxq->evq = evq;\n \trxq->ptr_mask = rxq_info->entries - 1;\n \trxq->refill_mb_pool = mb_pool;\n+\trxq->buf_size = buf_size;\n \trxq->hw_index = sw_index;\n \n \trxq->state = SFC_RXQ_INITIALIZED;\ndiff --git a/drivers/net/sfc/sfc_rx.h b/drivers/net/sfc/sfc_rx.h\nindex b506d9a..9719eae 100644\n--- a/drivers/net/sfc/sfc_rx.h\n+++ b/drivers/net/sfc/sfc_rx.h\n@@ -71,6 +71,7 @@ struct sfc_rxq {\n \tunsigned int\t\tptr_mask;\n \n \t/* Used on refill */\n+\tuint16_t\t\tbuf_size;\n \tstruct rte_mempool\t*refill_mb_pool;\n \tefx_rxq_t\t\t*common;\n \tefsys_mem_t\t\tmem;\n",
    "prefixes": [
        "dpdk-dev",
        "v2",
        "46/55"
    ]
}