Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/66110/?format=api
{ "id": 66110, "url": "http://patches.dpdk.org/api/patches/66110/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1582820317-7333-14-git-send-email-lbartosik@marvell.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": "<1582820317-7333-14-git-send-email-lbartosik@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1582820317-7333-14-git-send-email-lbartosik@marvell.com", "date": "2020-02-27T16:18:35", "name": "[v5,13/15] examples/ipsec-secgw: make number of buffers dynamic", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "b5907c17b4e7dbe88e488cd7cecacc380c8f56f8", "submitter": { "id": 1305, "url": "http://patches.dpdk.org/api/people/1305/?format=api", "name": "Lukas Bartosik [C]", "email": "lbartosik@marvell.com" }, "delegate": { "id": 6690, "url": "http://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1582820317-7333-14-git-send-email-lbartosik@marvell.com/mbox/", "series": [ { "id": 8713, "url": "http://patches.dpdk.org/api/series/8713/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8713", "date": "2020-02-27T16:18:22", "name": "add eventmode to ipsec-secgw", "version": 5, "mbox": "http://patches.dpdk.org/series/8713/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/66110/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/66110/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8E059A055F;\n\tThu, 27 Feb 2020 17:21:38 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 0B99A1C06B;\n\tThu, 27 Feb 2020 17:19:32 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 1E36B37AF\n for <dev@dpdk.org>; Thu, 27 Feb 2020 17:19:25 +0100 (CET)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n 01RFtriD011125; Thu, 27 Feb 2020 08:19:24 -0800", "from sc-exch04.marvell.com ([199.233.58.184])\n by mx0a-0016f401.pphosted.com with ESMTP id 2ydcm19hbr-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Thu, 27 Feb 2020 08:19:24 -0800", "from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH04.marvell.com\n (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2;\n Thu, 27 Feb 2020 08:19:22 -0800", "from SC-EXCH01.marvell.com (10.93.176.81) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2;\n Thu, 27 Feb 2020 08:19:22 -0800", "from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com\n (10.93.176.81) with Microsoft SMTP Server id 15.0.1497.2 via Frontend\n Transport; Thu, 27 Feb 2020 08:19:21 -0800", "from luke.marvell.com (unknown [10.95.130.81])\n by maili.marvell.com (Postfix) with ESMTP id 46B1D3F703F;\n Thu, 27 Feb 2020 08:19:19 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-type; s=pfpt0818; bh=sXPoY2Mf2y3U6JWaO9Sb80s21Kwd2PpzzoZQBMG6BuQ=;\n b=fSuF6EnIMWXdR5XSaOodMVg5i7a5yFaTvKlttfDFmi/5XYynLR9sD3YZtlcA2WQ3LSeH\n a+dWSpAjz1VIWJ+w3c1VKGEMLp2GMrcC9GmNkOr8Pdb+KDsu2BDMNlVcIqDNMw1zQ58b\n 401DYwuLpDJg7/wcATAmQm/FmnCw5/8bAZRmzUe9lzJuoZMo+ZYQOTMRHtPLbWg2FTFX\n UqL8KP4ZVAuEfFfEQ7rd9RPk4sUlNoOivhIoL1EYergzloekFBc8xvtXojqxcIbO24g8\n 42e1k7Pc1WKK8yybiRO9TZK/LixagmK17BKvBtHHzU3NIPDJx62ybIzbwBMqLhS6e4sL +Q==", "From": "Lukasz Bartosik <lbartosik@marvell.com>", "To": "Akhil Goyal <akhil.goyal@nxp.com>, Radu Nicolau <radu.nicolau@intel.com>,\n Thomas Monjalon <thomas@monjalon.net>", "CC": "Jerin Jacob <jerinj@marvell.com>, Narayana Prasad <pathreya@marvell.com>,\n Ankur Dwivedi <adwivedi@marvell.com>, Anoob Joseph <anoobj@marvell.com>,\n Archana Muniganti <marchana@marvell.com>, Tejasree Kondoj\n <ktejasree@marvell.com>, Vamsi Attunuru <vattunuru@marvell.com>,\n \"Konstantin Ananyev\" <konstantin.ananyev@intel.com>, <dev@dpdk.org>", "Date": "Thu, 27 Feb 2020 17:18:35 +0100", "Message-ID": "<1582820317-7333-14-git-send-email-lbartosik@marvell.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1582820317-7333-1-git-send-email-lbartosik@marvell.com>", "References": "<1582185727-6749-1-git-send-email-lbartosik@marvell.com>\n <1582820317-7333-1-git-send-email-lbartosik@marvell.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572\n definitions=2020-02-27_05:2020-02-26,\n 2020-02-27 signatures=0", "Subject": "[dpdk-dev] [PATCH v5 13/15] examples/ipsec-secgw: make number of\n\tbuffers dynamic", "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 <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 <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Make number of buffers in a pool nb_mbuf_in_pool dependent on number\nof ports, cores and crypto queues. Add command line option -s which\nwhen used overrides dynamic calculation of number of buffers in a pool.\n\nSigned-off-by: Anoob Joseph <anoobj@marvell.com>\nSigned-off-by: Lukasz Bartosik <lbartosik@marvell.com>\n---\n examples/ipsec-secgw/ipsec-secgw.c | 71 ++++++++++++++++++++++++++++++++------\n 1 file changed, 60 insertions(+), 11 deletions(-)", "diff": "diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c\nindex a03958d..5335c4c 100644\n--- a/examples/ipsec-secgw/ipsec-secgw.c\n+++ b/examples/ipsec-secgw/ipsec-secgw.c\n@@ -60,8 +60,6 @@ volatile bool force_quit;\n \n #define MEMPOOL_CACHE_SIZE 256\n \n-#define NB_MBUF\t(32000)\n-\n #define CDEV_QUEUE_DESC 2048\n #define CDEV_MAP_ENTRIES 16384\n #define CDEV_MP_NB_OBJS 1024\n@@ -164,6 +162,7 @@ static int32_t promiscuous_on = 1;\n static int32_t numa_on = 1; /**< NUMA is enabled by default. */\n static uint32_t nb_lcores;\n static uint32_t single_sa;\n+static uint32_t nb_bufs_in_pool;\n \n /*\n * RX/TX HW offload capabilities to enable/use on ethernet ports.\n@@ -1280,6 +1279,7 @@ print_usage(const char *prgname)\n \t\t\" [-e]\"\n \t\t\" [-a]\"\n \t\t\" [-c]\"\n+\t\t\" [-s NUMBER_OF_MBUFS_IN_PKT_POOL]\"\n \t\t\" -f CONFIG_FILE\"\n \t\t\" --config (port,queue,lcore)[,(port,queue,lcore)]\"\n \t\t\" [--single-sa SAIDX]\"\n@@ -1303,6 +1303,9 @@ print_usage(const char *prgname)\n \t\t\" -a enables SA SQN atomic behaviour\\n\"\n \t\t\" -c specifies inbound SAD cache size,\\n\"\n \t\t\" zero value disables the cache (default value: 128)\\n\"\n+\t\t\" -s number of mbufs in packet pool, if not specified number\\n\"\n+\t\t\" of mbufs will be calculated based on number of cores,\\n\"\n+\t\t\" ports and crypto queues\\n\"\n \t\t\" -f CONFIG_FILE: Configuration file\\n\"\n \t\t\" --config (port,queue,lcore): Rx queue configuration. In poll\\n\"\n \t\t\" mode determines which queues from\\n\"\n@@ -1507,7 +1510,7 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf)\n \n \targvopt = argv;\n \n-\twhile ((opt = getopt_long(argc, argvopt, \"aelp:Pu:f:j:w:c:\",\n+\twhile ((opt = getopt_long(argc, argvopt, \"aelp:Pu:f:j:w:c:s:\",\n \t\t\t\tlgopts, &option_index)) != EOF) {\n \n \t\tswitch (opt) {\n@@ -1541,6 +1544,19 @@ parse_args(int32_t argc, char **argv, struct eh_conf *eh_conf)\n \t\t\tcfgfile = optarg;\n \t\t\tf_present = 1;\n \t\t\tbreak;\n+\n+\t\tcase 's':\n+\t\t\tret = parse_decimal(optarg);\n+\t\t\tif (ret < 0) {\n+\t\t\t\tprintf(\"Invalid number of buffers in a pool: \"\n+\t\t\t\t\t\"%s\\n\", optarg);\n+\t\t\t\tprint_usage(prgname);\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\n+\t\t\tnb_bufs_in_pool = ret;\n+\t\t\tbreak;\n+\n \t\tcase 'j':\n \t\t\tret = parse_decimal(optarg);\n \t\t\tif (ret < RTE_MBUF_DEFAULT_BUF_SIZE ||\n@@ -1913,12 +1929,12 @@ check_cryptodev_mask(uint8_t cdev_id)\n \treturn -1;\n }\n \n-static int32_t\n+static uint16_t\n cryptodevs_init(void)\n {\n \tstruct rte_cryptodev_config dev_conf;\n \tstruct rte_cryptodev_qp_conf qp_conf;\n-\tuint16_t idx, max_nb_qps, qp, i;\n+\tuint16_t idx, max_nb_qps, qp, total_nb_qps, i;\n \tint16_t cdev_id;\n \tstruct rte_hash_parameters params = { 0 };\n \n@@ -1946,6 +1962,7 @@ cryptodevs_init(void)\n \tprintf(\"lcore/cryptodev/qp mappings:\\n\");\n \n \tidx = 0;\n+\ttotal_nb_qps = 0;\n \tfor (cdev_id = 0; cdev_id < rte_cryptodev_count(); cdev_id++) {\n \t\tstruct rte_cryptodev_info cdev_info;\n \n@@ -1979,6 +1996,7 @@ cryptodevs_init(void)\n \t\tif (qp == 0)\n \t\t\tcontinue;\n \n+\t\ttotal_nb_qps += qp;\n \t\tdev_conf.socket_id = rte_cryptodev_socket_id(cdev_id);\n \t\tdev_conf.nb_queue_pairs = qp;\n \t\tdev_conf.ff_disable = RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO;\n@@ -2011,7 +2029,7 @@ cryptodevs_init(void)\n \n \tprintf(\"\\n\");\n \n-\treturn 0;\n+\treturn total_nb_qps;\n }\n \n static void\n@@ -2665,20 +2683,36 @@ inline_sessions_free(struct sa_ctx *sa_ctx)\n \t}\n }\n \n+static uint32_t\n+calculate_nb_mbufs(uint16_t nb_ports, uint16_t nb_crypto_qp, uint32_t nb_rxq,\n+\t\tuint32_t nb_txq)\n+{\n+\treturn RTE_MAX((nb_rxq * nb_rxd +\n+\t\t\tnb_ports * nb_lcores * MAX_PKT_BURST +\n+\t\t\tnb_ports * nb_txq * nb_txd +\n+\t\t\tnb_lcores * MEMPOOL_CACHE_SIZE +\n+\t\t\tnb_crypto_qp * CDEV_QUEUE_DESC +\n+\t\t\tnb_lcores * frag_tbl_sz *\n+\t\t\tFRAG_TBL_BUCKET_ENTRIES),\n+\t\t 8192U);\n+}\n+\n int32_t\n main(int32_t argc, char **argv)\n {\n \tint32_t ret;\n-\tuint32_t lcore_id;\n+\tuint32_t lcore_id, nb_txq, nb_rxq = 0;\n \tuint32_t cdev_id;\n \tuint32_t i;\n \tuint8_t socket_id;\n-\tuint16_t portid;\n+\tuint16_t portid, nb_crypto_qp, nb_ports = 0;\n \tuint64_t req_rx_offloads[RTE_MAX_ETHPORTS];\n \tuint64_t req_tx_offloads[RTE_MAX_ETHPORTS];\n \tstruct eh_conf *eh_conf = NULL;\n \tsize_t sess_sz;\n \n+\tnb_bufs_in_pool = 0;\n+\n \t/* init EAL */\n \tret = rte_eal_init(argc, argv);\n \tif (ret < 0)\n@@ -2727,6 +2761,22 @@ main(int32_t argc, char **argv)\n \n \tsess_sz = max_session_size();\n \n+\tnb_crypto_qp = cryptodevs_init();\n+\n+\tif (nb_bufs_in_pool == 0) {\n+\t\tRTE_ETH_FOREACH_DEV(portid) {\n+\t\t\tif ((enabled_port_mask & (1 << portid)) == 0)\n+\t\t\t\tcontinue;\n+\t\t\tnb_ports++;\n+\t\t\tnb_rxq += get_port_nb_rx_queues(portid);\n+\t\t}\n+\n+\t\tnb_txq = nb_lcores;\n+\n+\t\tnb_bufs_in_pool = calculate_nb_mbufs(nb_ports, nb_crypto_qp,\n+\t\t\t\t\t\tnb_rxq, nb_txq);\n+\t}\n+\n \tfor (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {\n \t\tif (rte_lcore_is_enabled(lcore_id) == 0)\n \t\t\tcontinue;\n@@ -2740,11 +2790,12 @@ main(int32_t argc, char **argv)\n \t\tif (socket_ctx[socket_id].mbuf_pool)\n \t\t\tcontinue;\n \n-\t\tpool_init(&socket_ctx[socket_id], socket_id, NB_MBUF);\n+\t\tpool_init(&socket_ctx[socket_id], socket_id, nb_bufs_in_pool);\n \t\tsession_pool_init(&socket_ctx[socket_id], socket_id, sess_sz);\n \t\tsession_priv_pool_init(&socket_ctx[socket_id], socket_id,\n \t\t\tsess_sz);\n \t}\n+\tprintf(\"Number of mbufs in packet pool %d\\n\", nb_bufs_in_pool);\n \n \tRTE_ETH_FOREACH_DEV(portid) {\n \t\tif ((enabled_port_mask & (1 << portid)) == 0)\n@@ -2756,8 +2807,6 @@ main(int32_t argc, char **argv)\n \t\t\t\treq_tx_offloads[portid]);\n \t}\n \n-\tcryptodevs_init();\n-\n \t/*\n \t * Set the enabled port mask in helper config for use by helper\n \t * sub-system. This will be used while initializing devices using\n", "prefixes": [ "v5", "13/15" ] }