From patchwork Wed Jan 17 08:51:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 124786 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp1308072lje; Wed, 17 Jan 2018 00:52:50 -0800 (PST) X-Google-Smtp-Source: ACJfBovaPXBs/vnzAB68GX1V8QMPBI6inTTzEpdPghNNVwacEZ0aowewXmayG6/MzWtyXF68CU1K X-Received: by 10.223.156.145 with SMTP id d17mr1795623wre.198.1516179169919; Wed, 17 Jan 2018 00:52:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516179169; cv=none; d=google.com; s=arc-20160816; b=duPCLhatlDL83o6X4b03VqrvPMQaLNPIPL3QlkwZT6P03lLS/EuGrLo2QGxDxtQoSh EnHnPwUHMODi5pxO4OPLjkqVjyy1OI/vfFSP1mz48lWNa8pHNZF7rfTLFQL+SRCIDuih gDeoN4+m97gKBIiMtRIy+4Tg7vcsK96ti47szBuGlagcNH2nhR4Ng0VoDN2i1IT/9pzZ zYlbw9MA/G+NzWRr5KjkTIXfAZmbrPfDAYlq+ALs89Bd6FIUJ029chqHcgxhoIQpF0UT ypTjrDqeXeY1kNeC0IzJM/zYadyzyUlHMJlgvVv+mj/jd/6NAujvvMmbDFNEGIi5ITIA 32/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:arc-authentication-results; bh=3Z/IJD+RP2V65ofvlv/uPqhTMo04euy4Otc0N/OiZuw=; b=HcWpMuCEBjpD9pMn45z7y1ylT98T5tkOO8BX1ye8lflb/KrfwGe4DlF4eivQjvFeqG oGk8omGY9Dj7D7z2e6C9OA60175+DalH8s7ZrydJyqwfmH5/kuAtODPqOdN1E1AYgOD1 BtMVkLsvkTumV/2S0LNAKTddHbyrdM4BM29yfJZJLmWqefKRotTwKUdvoF8fUA4nUevC +96E6HTdDlIYpzytnWrrqnaFYr8ALY2RGj/BcjrTUEtl3eHC0tp0UAfrKZL6dsUXOlX2 AYWpXi9+7XiDaEoa7sx5jy/hY6Tjc+LXz9YVXJdQF93p7YnODcyCNLKmO8tC/1kghrfM +Xpg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id v35si3807412wrb.195.2018.01.17.00.52.49; Wed, 17 Jan 2018 00:52:49 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8F384A48B; Wed, 17 Jan 2018 09:52:49 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0041.outbound.protection.outlook.com [104.47.36.41]) by dpdk.org (Postfix) with ESMTP id E592F4B4B for ; Wed, 17 Jan 2018 09:52:47 +0100 (CET) Received: from BN6PR03CA0010.namprd03.prod.outlook.com (10.168.230.148) by BN6PR03MB2689.namprd03.prod.outlook.com (10.173.144.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Wed, 17 Jan 2018 08:52:41 +0000 Received: from BN1BFFO11FD020.protection.gbl (2a01:111:f400:7c10::1:172) by BN6PR03CA0010.outlook.office365.com (2603:10b6:404:23::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Wed, 17 Jan 2018 08:52:41 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD020.mail.protection.outlook.com (10.58.144.83) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Wed, 17 Jan 2018 08:52:41 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w0H8qcNo009961; Wed, 17 Jan 2018 01:52:39 -0700 From: Hemant Agrawal To: CC: Date: Wed, 17 Jan 2018 14:21:32 +0530 Message-ID: <1516179092-22908-1-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512563473-19969-1-git-send-email-hemant.agrawal@nxp.com> References: <1512563473-19969-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131606527614417073; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(7966004)(39860400002)(346002)(396003)(376002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(76176011)(85426001)(51416003)(104016004)(36756003)(508600001)(316002)(86362001)(48376002)(59450400001)(26005)(16586007)(4326008)(2906002)(53936002)(305945005)(50226002)(106466001)(5660300001)(356003)(8936002)(2351001)(81156014)(6916009)(2950100002)(81166006)(97736004)(50466002)(105606002)(68736007)(8676002)(77096006)(6666003)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2689; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD020; 1:HvmyhWJYNDKFUAPPw9fn96EK2wHTyAIeDbfyakWpPlPoLXEgn5t14gfZ/WvJTzptR4R2/ISr3CDs5z+x5NqSslYVG7ng4VUtozS7WYt9SMV7n0H1MM4kW7FdM+unKaBO MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0abbacd8-a992-490d-78b1-08d55d87ab0b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603307); SRVR:BN6PR03MB2689; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2689; 3:c8OtmViTl5Xm86LCt9N8cJI1MNas3T62ouSIWlEHL2mVVeET5q3Xy3TsMlB1KekruY7gxBuMrk2Vy5anTXq/SFse9vQqLPu22CBM1H/M0CDodAbDCN18+qAOsNNAEu31yKqsQ85qmZEXdpkxgaLCHCPYW4tonQCTKeC1yfcwnD9gz61oFBS8ONVm3FkwYv4yYnMiGWgFOBuecP+8PvkyHhxRx89ZIMyTRd3FT94Ev6VtF3KkPSMbInqzjO8upG0OEGH5zpatEOeCF28MPCwFsCmZKKoeMn4HeUAcKh9RweLUZFJkOtXZsQH5wihTVtBpi7wsu5W3EzpCVQh+mw7IUNRi6WEjK1FO9pJbJlqcBRU=; 25:nblMawEPMrsH9gXjP5/TBOHzUYlG+LRrhyEV+U+gDQ9l1XwW8VOxMa+L17o5YNdKyGKVJiZwO4c/mJP9YGhGUagA5NsXspcWYrXAAl9IVSdz9pVfGVk1pjYVOaa0W1wpRNYQ9vy1CseavulCqwiAmZ+wIXoh6slAL3SDqg9A3UU+K4WEh2YvL5omR2ch7A23Q2HvS93EZDtBiuiGUFNVpLWiRJY5cXGOj8bVPqi7n5SmbjwTcJ0JBv2kYApgCzCk0K66GKI9nDR+99BWAh7YzXwqFLKnzZ1ZMdSHXkiFN/WlE1yb4L6HLgkyilnlGBWfZXVc0tHefguJ5wYs0YBJKw== X-MS-TrafficTypeDiagnostic: BN6PR03MB2689: X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2689; 31:BY5fhQn6ZrOjBa1+es4WHtrRzXA9jdeAJdFslpfmKckBhGwe5FqCYWKZqee2bp1ylo7tXW3jL0MqWo6D7rJ20q+dtKxHMP2L16/xzLyTAe6OqTqlSl0YNEcaffpiMyYNTtd+guUbz4Lu0MZYdft740c/rFY0Ek52ikTBsCG+YJr5qQje5ASW4aYJTW0LlY1Ixym7DY7gOANw5iplSxr2p4Mp9He7wUK26EBqcUieKu4=; 4:iyOSP++tz7HpNOZAO3ALsrf9MsuAK6FtQdaBwvDuzau2E4dFB9g8Af+F2Rao10Jo0XZ73R1qhrIOnUTlLcZFXhqRdL7JbEZQrE2Yk0eEHIj8kYJLZIxH4xeAD/lx0EjpUi+Rk9RrU9PqWrS019teDxkzk9nmyNKjUK298/jeH7hgi4ejlNYBN1OKz7fcgaNkFgf/70dZDuoddhLpceNNM7h2yKGaAQLQUzuB3XaIx/9UVfWje+KAz9zIScmrFf2TFIoROopXPrQ/wW2blb92VlH2y2Ioi7HvibueWlhRdbTc9hRH02Sn80OZpwPaUrVFgno/VlqGrpFtWQYK4zIvhOdCg9SS2ANvZvcFj+glsqY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(131327999870524)(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(3231023)(944501161)(10201501046)(3002001)(93006095)(93001095)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(20161123559100)(20161123563025)(20161123556025)(20161123561025)(20161123565025)(201708071742011); SRVR:BN6PR03MB2689; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:BN6PR03MB2689; X-Forefront-PRVS: 0555EC8317 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2689; 23:rT1vBhf+f9pkXakMMrtgxIjHe9iq+FGTMLEbOy99/?= HghAdj+ZwOUecJoQugmM2Fx2QuzKgK4+1nN4KVvyfEtjjXR2Lp4pxtJsrBOOPpbcSG9k/WFmbNPYqcF063kGA+JiRv0HUbsd+mBAYbeSXa3YAort5NKh0Us3mBZ2TRwQYxoQhn7ozl1LtPiVCLpdy/YqJboAcbO3IM8JyDKVNER/aWtHJjXtUOSghSuGlLXiXJVW3Rfzs9OGPm2z9odXF5A9edoNTMr8nZclnFJg6BnqmvKfpVQ+N5YXkpIVXWK8sNzXpk7PqWdYwa4FXr8jQV0QMuxeM1uhzffXygSq3OpFgeZSMccaWEAdS6bHyTZCGwxREh28ui/db3vbT5DJbaggWb4nRFu5IYrnPc9ctHmEVa4Kbf95bUjXIzkk9M4uqUGuJ/F8+nzrhybVip111Oi3bSJiOBmPGNKcZ/Z0+TNJBt4hKxx5GYFbPspFtL8DqltDT+e56kENb6tA5AkwOvYtr0ej2Wu15YQ4BcI0rBxcqI1p6JAlQioGkAI2cIYWxzlcFA1KEsW/L5qzKxKK3l2LoPA1x//9Ftk86pGhU0UW3rEuii4vRpW6L0/m2vzAKgvXRNjgBVQ1ylLoX6f/k+fXmld6CKlF6SE6e4YfqCRfPLBNQn5o02n2D3h0yR2nr4uUDV/qCMmqMHQAiyjY+Ur2IROiHq5EktMkGhRhtUrfLTjCDKkVDJKOaiiR9V5Byx3iziqMQl/lZhhc/YXntTdNHFfUThFVlWtmRofXm1Co95XeLaeoi3AiJNSQhcYhK+yFaWjVUv6r+gc0raGGzIhqLDHuOan2cf9hllUuKFvYjXcIGNLXm6Wk2O3bhF1yg18IvoTLVl6fM4RgcbC5KI8SYL6JKhW4DdpOwH6TYr63k2Ul+MKRsWEWdWFDm3Srs/uFhRqCkdIWtozPwS3W5EMdSGrL6R/q0GzW8+0ChLtETCm5T7qqVgK1ByvQdcIliPJVDsAIrSmLP757maVyO5tUGzPRjuJLydIvHsf+KxCYwA3fH8nTs59jEFWFQisGQsuw3xAtMo8Y5LICIzmkLFt X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2689; 6:E79bUBYYhHWH7QF/a7Lz3AH/4WmVyl8JIT+5SIo2Qm7QTY1MElunmH57SBDlKrmeJHMPVRoOK6ptOkEcccUpmrk4xX9LawDjyZ/D3rBE/Kfncxjwz289rIe8BtmWdCjZhwmHNVvLG1iIUU+k4KIqXpPzipjIb/SyReN48Nax6fyMJBtw3/A/LezHrXmwhInr5Ad6SuSVIz5wQEWddnq6zZHjw20Sk3bLk/aLafSg9VLpQrvNDuj5MFvG7Qssy0YAEXzcS56PDT7AU+ZwPDRmwqSGNfEyWaGlbgfvZOwKrSlNW5wDz8t5z/r7luB3UhYgTdRF2IMkeNz+FNtpKPMDlqRTNcJRuW6cyFWb5/k9LTs=; 5:3YHDQA70P4uW3LJCRse9URB8D1hqJ4YjAojhZwHVmr18zKKb+V56CNKbs1Xf7dJxxhut2EiMR83EirHZ+Xj7sQmjO2kGMey02iqtoHawtCxhBzSA+fqv4tzpu304abPlVc1juQUuGLGBS9R1PHQLdnbZfAXLewwzHfvbbhwwYlg=; 24:xdoeHmB7jrAqTXsBbr4dd1Nvr9/EYvq3/R2XeEQsAZZ2qXUUeYhPdeOI9mSLyUXE2xIPk0aJjZZADT0P9AQ7TbYT4i7L+qjAgOuul4WNmDQ=; 7:sapYnZx4MYEu4OJUyFyeYG9OUlbowufdiD8kpmXHMO2jlnQiRi2d4r9Z3J6UvFxKukDzU9BG2/XV5i1sZsD1d0agD9jKorYJ1ho4A8YS51gmKf79HcfSf5Zl4Ft8DWec7mHWOq5w8xeXe8Q6f3Tbvo3yeCY1PlrmsyZIGJA1oDgWUD+0MfsRgHr4s74C1VQotU6JJ5iT7E1dKKGWu4XJnxP0k1TWIsiICGWMIJdVe74R2dINEyshrlLLILeZH9jt SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2018 08:52:41.2545 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0abbacd8-a992-490d-78b1-08d55d87ab0b X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB2689 Subject: [dpdk-dev] [PATCH v2] mempool/dpaa: optimize phy to virt conversion X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" If the allocation is from a single memzone, optimize the phy-virt address conversions. Signed-off-by: Hemant Agrawal --- v2: use register memory area instead of new flag in mempool drivers/mempool/dpaa/dpaa_mempool.c | 50 ++++++++++++++++++++++++++++++++++--- drivers/mempool/dpaa/dpaa_mempool.h | 13 ++++++++++ 2 files changed, 60 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/drivers/mempool/dpaa/dpaa_mempool.c b/drivers/mempool/dpaa/dpaa_mempool.c index ffb81c2..ddc4e47 100644 --- a/drivers/mempool/dpaa/dpaa_mempool.c +++ b/drivers/mempool/dpaa/dpaa_mempool.c @@ -73,6 +73,8 @@ dpaa_mbuf_create_pool(struct rte_mempool *mp) rte_dpaa_bpid_info[bpid].meta_data_size = sizeof(struct rte_mbuf) + rte_pktmbuf_priv_size(mp); rte_dpaa_bpid_info[bpid].dpaa_ops_index = mp->ops_index; + rte_dpaa_bpid_info[bpid].ptov_off = 0; + rte_dpaa_bpid_info[bpid].flags = 0; bp_info = rte_malloc(NULL, sizeof(struct dpaa_bp_info), @@ -145,9 +147,20 @@ dpaa_mbuf_free_bulk(struct rte_mempool *pool, } while (i < n) { + uint64_t phy = rte_mempool_virt2iova(obj_table[i]); + + if (unlikely(!bp_info->ptov_off)) { + /* buffers are not from multiple memzones */ + if (!(bp_info->flags & DPAA_MPOOL_MULTI_MEMZONE)) { + bp_info->ptov_off + = (uint64_t)obj_table[i] - phy; + rte_dpaa_bpid_info[bp_info->bpid].ptov_off + = bp_info->ptov_off; + } + } + dpaa_buf_free(bp_info, - (uint64_t)rte_mempool_virt2iova(obj_table[i]) + - bp_info->meta_data_size); + (uint64_t)phy + bp_info->meta_data_size); i = i + 1; } @@ -215,7 +228,7 @@ dpaa_mbuf_alloc_bulk(struct rte_mempool *pool, * i.e. first buffer is valid, remaining 6 buffers * may be null. */ - bufaddr = (void *)rte_dpaa_mem_ptov(bufs[i].addr); + bufaddr = DPAA_MEMPOOL_PTOV(bp_info, bufs[i].addr); m[n] = (struct rte_mbuf *)((char *)bufaddr - bp_info->meta_data_size); DPAA_MEMPOOL_DPDEBUG("Paddr (%p), FD (%p) from BMAN", @@ -246,6 +259,36 @@ dpaa_mbuf_get_count(const struct rte_mempool *mp) return bman_query_free_buffers(bp_info->bp); } +static int +dpaa_register_memory_area(const struct rte_mempool *mp, + char *vaddr __rte_unused, + rte_iova_t paddr __rte_unused, + size_t len) +{ + struct dpaa_bp_info *bp_info; + unsigned int total_elt_sz; + + MEMPOOL_INIT_FUNC_TRACE(); + + if (!mp || !mp->pool_data) { + DPAA_MEMPOOL_ERR("Invalid mempool provided\n"); + return 0; + } + + bp_info = DPAA_MEMPOOL_TO_POOL_INFO(mp); + total_elt_sz = mp->header_size + mp->elt_size + mp->trailer_size; + + DPAA_MEMPOOL_DEBUG("Req size %lu vs Available %u\n", + len, total_elt_sz * mp->size); + + /* Detect pool area has sufficient space for elements in this memzone */ + if (len < total_elt_sz * mp->size) + /* Else, Memory will be allocated from multiple memzones */ + bp_info->flags |= DPAA_MPOOL_MULTI_MEMZONE; + + return 0; +} + struct rte_mempool_ops dpaa_mpool_ops = { .name = "dpaa", .alloc = dpaa_mbuf_create_pool, @@ -253,6 +296,7 @@ struct rte_mempool_ops dpaa_mpool_ops = { .enqueue = dpaa_mbuf_free_bulk, .dequeue = dpaa_mbuf_alloc_bulk, .get_count = dpaa_mbuf_get_count, + .register_memory_area = dpaa_register_memory_area, }; MEMPOOL_REGISTER_OPS(dpaa_mpool_ops); diff --git a/drivers/mempool/dpaa/dpaa_mempool.h b/drivers/mempool/dpaa/dpaa_mempool.h index 91da62f..02aa513 100644 --- a/drivers/mempool/dpaa/dpaa_mempool.h +++ b/drivers/mempool/dpaa/dpaa_mempool.h @@ -28,6 +28,9 @@ /* Maximum release/acquire from BMAN */ #define DPAA_MBUF_MAX_ACQ_REL 8 +/* Buffers are allocated from multiple memzones i.e. non phys contiguous */ +#define DPAA_MPOOL_MULTI_MEMZONE 0x01 + struct dpaa_bp_info { struct rte_mempool *mp; struct bman_pool *bp; @@ -35,8 +38,18 @@ struct dpaa_bp_info { uint32_t size; uint32_t meta_data_size; int32_t dpaa_ops_index; + int64_t ptov_off; + uint8_t flags; }; +static inline void * +DPAA_MEMPOOL_PTOV(struct dpaa_bp_info *bp_info, uint64_t addr) +{ + if (bp_info->ptov_off) + return ((void *)(addr + bp_info->ptov_off)); + return rte_dpaa_mem_ptov(addr); +} + #define DPAA_MEMPOOL_TO_POOL_INFO(__mp) \ ((struct dpaa_bp_info *)__mp->pool_data)