From patchwork Wed Dec 27 03:55:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongseok Koh X-Patchwork-Id: 32758 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8F7EF1B2B6; Wed, 27 Dec 2017 04:56:05 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0071.outbound.protection.outlook.com [104.47.0.71]) by dpdk.org (Postfix) with ESMTP id BB1221B297 for ; Wed, 27 Dec 2017 04:56:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=iyfFycgpReolxsoojBJDq4t3V0CaYP4X9GbhvOsO7p4=; b=mfzbANbJg/v//tHeH6+6rqhznf1PpSsNQOPOHr0EkJtG3q/I3f/m+z3ODY6yxaUaieB2o2DAtzacXqg4qQ4l0MWEyRAUjve9UwAtD9xXVWjp19T049nys8Mxc08HtCeC4ZgR0ZmbfJrcYX7EYuHy+bnKK1i7Vm/+WJroj0bcm9g= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by HE1PR0501MB2043.eurprd05.prod.outlook.com (2603:10a6:3:35::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.345.14; Wed, 27 Dec 2017 03:56:02 +0000 From: Yongseok Koh To: adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Cc: dev@dpdk.org, Yongseok Koh Date: Tue, 26 Dec 2017 19:55:43 -0800 Message-Id: <20171227035547.29571-1-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CY4PR1701CA0007.namprd17.prod.outlook.com (2603:10b6:910:5e::17) To HE1PR0501MB2043.eurprd05.prod.outlook.com (2603:10a6:3:35::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: abe700b1-a76b-4cb6-b3d1-08d54cddbfcc X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(48565401081)(2017052603307)(7153060); SRVR:HE1PR0501MB2043; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2043; 3:W0UlO18MuIfnOBNEnVvEuc4uH5oWf180jln9ev+D4HNq2OyS8kvjI8cTOwRIuL7gDC2AqQpfyaFT5yuEI2OiA1wmScKleJD9xsIGmMiooNuWkZPQiqVKfdUQBPvUjGthhsudhqOJTqMHORhSkda+LDw8c+2kh+1zVYsBanPd/8xcnFmaEMMfYUN0s3gfkee/0cDPFgMiAJme92JdCj29cjaXCmVKEKnYqb8W+/dKnNz0io6xqQUsJOWTS7MZtNPF; 25:LQJo/N0bzhhhaZAxUcWSJOoPfCRQGc92WGKRLZxPTGgAjW0CTqpaLyGBMWlFJRtXqSk95tQsuPJAnLuQDge7SJsOOpjkYv4r8A9ae7GIEP2yMLhtBLwFLGuoXew6RRGG9G9mSUsIL0PPZEWsNe40ZkSthtrV9b/xzrVzRGlrFMz1/TprU9k9mF3LVPKuHMkwQtilZQzX56CGyHWvlKx5dxmX5DE7WxQrvySmiUTlMPllnBgSDwygGQ3y7coHKnDtX8J8FOSTlgbRncYFWlk3E/7iMuhcSFg/KRMYdEoCxTSIpUH3MstxSUDyZ3WYuHn9g8lgeMlX6j6PgFdZKMHXJQ==; 31:aE/kzduqC1wl7upjLmfkLC8RlQCIaxrR8deVwA53V42EcVp9yDGKMfOT3jaPNr+/h5IDu/u1sAZxkGffgvpS8HyDXq3fsj9EYASd09Iw2gShNnLEygSJn6WEzbDsM3LENQj8ykjs2RqTHESxci7g38j2dPbBYsdj016D8nqzrJUDQrncJLKfDamWKKOKtLq9aCZlPx8N4PZD4ZZUAw8UppS/NVi+tuz2SAu155O2m4E= X-MS-TrafficTypeDiagnostic: HE1PR0501MB2043: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2043; 20:xcyivUVPxaS3pK9IVlLdOOsenggntE1a7oVmpBgxlsymGoEVW0B/l7B4IdUkOMMIKDP60oSKEKbzQehk5ZQ1mEowXH9G37hUWOpOur6IOOZ/fhoyJfP8yezS6gryi1minRvsZ4dltQzilqEhyIdMiyEmIKeYpj3y5zwMUDei2As8qhyfVJ7i5A7+x1pZVAXuMJRi16i6EmIU7gMT+Zv/LtqsYpmIhAPyP1cUI2FXnBdRe936pFjxv16+B86f4kkjb7S0QHCuBZKmxjx0o2PMAroMC2L7LcVn01niOMjcbTUwv5OTo4RFCeM3ofr+QFv4DJmF5RldQ5fWAf0cWFVLsMftuekvA34B165suQ33xdLPnIcmN9ChMWagFqEiQJMOVyYZE6KVxwCrN7aFuez95xtI0TCjNn3G6lBnIygrqMO4vseoe0l8WhXIV6SOT0hjjx/5xZE5gfiRlLVEIheYabrd+60svvpXnGBujFm5yCoEP0cEBYnfuGhtkRuwBKK6; 4:aVCU3NVG268stDhiAmT3ok/oKFsWmbZHcva2cKT6cCzCj6ObQLoev6busxi4pSMK9tPBX35sTqVG07QRc4fZYuVlkZUN+OtRMaoa7iubmCVlG8Dy30sSFQFOXvPt8vnDSZgwNH41R1+XSq+FEO0MPoQ0alFlR19mozbORrpjjLUm06bxBGefnLMbaxhTyTQ1tYJV5B0GLVFF2VpK6i7EwMgZqosi8flmfFKBruR3iftf11CvSedfdShl9FGdL88JE1k+2HEm4Q7G/Gzld0xv2Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231023)(944501075)(93006095)(93001095)(6055026)(6041268)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:HE1PR0501MB2043; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR0501MB2043; X-Forefront-PRVS: 0534947130 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(366004)(396003)(376002)(346002)(39860400002)(199004)(189003)(66066001)(97736004)(316002)(107886003)(5660300001)(25786009)(3846002)(478600001)(16526018)(105586002)(16586007)(53936002)(106356001)(81166006)(81156014)(8676002)(8936002)(50226002)(68736007)(86362001)(575784001)(4326008)(2906002)(36756003)(55016002)(21086003)(386003)(7696005)(1076002)(51416003)(6116002)(47776003)(7736002)(6666003)(305945005)(52116002)(69596002)(50466002)(48376002)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0501MB2043; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0501MB2043; 23:Iho9hEIP7MuX/OTA2rvQSbWAWyEfjBmduGkVatm?= iJ6KSUVS/sDeh0lRCnJMNI2XJpTK6eSwJXT10nNB7622ajRzQ3uf95pqFlxHLXOSI3vGT9MeTKxXAkmfis/ck+jaqBOXXqZbNWm4BRLF+Xu4h7JW6XT4D9sH2L2bXg1f26RaZP0j/vaPVBzjbHY4117m8uEJfDNZrLvrDQb4ozrzaDNoO8xEJWAYZeg8hZnAr8Wiz5ZaTHv0cYZ/VspoIosC1gufIzZwyOZgRjRuiwCBm6vuy/BRzIat/fjQiGp3GNQCcy5Z0x7a4J0gFWxhbrwB4bOcPbtk/py6DSzkBQQd5Gpryep3J76K0mlsAyzPc4MfGc3l6B7SMOTPTRg5Cgq45i+TemKpVX1eCaIQ8rZhkAZpgBfqw0HX2aY4HuDyH0b6j5TU9obxo1WXYqMJ/zNTzZbvniFCyaAIMGNc8SrvuAfDbqxsMxy08k4yFpMWYVsvQ5W+gwyxtx2RdegrZS1EQo2r0hMaCIQrVcNQiYRDe+XC7WqnWXPMRs2B/rk5YIDTIVLgZoaaTeVHEbEgxvDgjwuyUguNBrEW/wMVUki1EachbGczTeK5+QzARwuJj/F7IrtKJPEaKeQufFWM9zNMFKexZ6/S7YJ2agm+JOfzOi9/viZ/ErujoIEptQ7ogHCLo7d6LHsOr4nZFvzW2vx7pQXXCOB38CxkMaLXf1/MCrPnIDwn2u2OyrICIXgJnMkPu7F9kEy/Z6dl8gVL56X+1dZZx/PJkRv7Fo58Z7a1E0TB4h8OwKTejVkGnRydfNPAK7ByiDB8QXqW3GN8pmi0XMmO4EMvyvI0kCZAuLt/9F2w04WWPW5f9sbjOpXRoaKUL9wAhyzKfxbPeTA5IBaDyrvKz0KFyAUKlZslNgUNaYCwPCLko9zXfeSwUGWumU9h6L83FkxkGShKDq/qNzhX8QbfG0114dCo0Jl6Bc8FxoGK7CliYXV+C8Q6ByIKBXMWEr7z8ZWgA/SiLeb205ROzyJXGInUS9PLNdizVYdA7EWZHN5uE49p1TFOaEog1Jga69icZ5fDdTL/d+japt57UQV9TCyHbMISo3yOqcOdUL9bJbWVmFld14kPlRe3iIa4= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2043; 6:mlM5Kt/tp8YfAly0aE50ibZ4FcLl6zRiW1bJTcAy95SdHKi7xtIeimXeZFP1hOQhnOE4SqJdJI1aduGlzkOG9ZqPW7U1rfZ7F6VB0JMKyW+jBaXRbs+uNqI2XVGt5hEWsLVhZlrbdOfR8b65mWaPxdoKiEhfnqgcs5jGWQ/ConjPLFnCD1TkncpBvnbUlCdbvFgOkVKlJTiFRJK7SKJ+YgUWUYHZNFKulAhsqsTEXUR32fBW4xcxqwWc99G148j2fEbc/klCVNFOxNiEzhb5863GgKYsfmWJuR/w9COLMIKSWBkXVeI8/IXlCMl+0o/cwPvM1q90eECSDbaNFAMyE+Q0Btt92mgymBOaMeSREUE=; 5:Qb71gkbQH2brD5JwlKhHyhdO0reBs5m7EUNl7ihVlwmnDi1BIfQ8DDBB+DOgC8sflehNZ4ua3K7SgQIzDsZ3nEDGd1SYB6T5J4kC4ODZSza/jP65Xfy+4Uu93dxb4O9MFAKatDHne12j3yfHJmqzs+zXUSWDGj1CpiWhWuZJfxQ=; 24:mIRP/snSr49bt2KTbxcxniGJwpV5C6hf2t313jPDPUxwkp8F94gj9Y/imxhvPy5e3ifAcFdn1LQOS6sDaXKi/7PY/w2oSx1jTC77yPdkAgk=; 7:zIBseNF/D7Z67QXX/BV/o5OLIZroQsbhFs/zW4vvm9n1yW79GNoRKDSg0z4W+vaFjbv8x2bNWWJnkEk9ijBRfOGrcXkiPWY0SUn985K1q3x/BTq4Iy1MCScS1a+7riD7i107Y8qFq+Wc8wcVrzOLgK6ESRU0fab2iemkUcR6tF4wrhamPHBjDP/+e+kKlfx9R+2JuvWokRxGgTe6CqodHcBLsIoeiwqRJdf8c8fx/hzcZvorDzAElY+MhYFgTEqy SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2017 03:56:02.1045 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: abe700b1-a76b-4cb6-b3d1-08d54cddbfcc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0501MB2043 Subject: [dpdk-dev] [PATCH 1/5] net/mlx5: enable inlining data from multiple segments 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" mlx5_tx_burst() doesn't inline data from the 2nd segment. If there's still enough room in the descriptor after inlining the 1st segment, further inlining from the 2nd segment would be beneficial to save PCIe bandwidth. Signed-off-by: Yongseok Koh --- drivers/net/mlx5/mlx5_rxtx.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 28c0ad8ab..1e0f5dc52 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -390,7 +390,7 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) if (max_elts < segs_n) break; max_elts -= segs_n; - --segs_n; + sg = --segs_n; if (unlikely(--max_wqe == 0)) break; wqe = (volatile struct mlx5_wqe_v *) @@ -516,7 +516,7 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) } /* Inline if enough room. */ if (max_inline || tso) { - uint32_t inl; + uint32_t inl = 0; uintptr_t end = (uintptr_t) (((uintptr_t)txq->wqes) + (1 << txq->wqe_n) * MLX5_WQE_SIZE); @@ -524,12 +524,14 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) RTE_CACHE_LINE_SIZE - (pkt_inline_sz - 2) - !!tso * sizeof(inl); - uintptr_t addr_end = (addr + inline_room) & - ~(RTE_CACHE_LINE_SIZE - 1); - unsigned int copy_b = (addr_end > addr) ? - RTE_MIN((addr_end - addr), length) : - 0; - + uintptr_t addr_end; + unsigned int copy_b; + +pkt_inline: + addr_end = RTE_ALIGN_FLOOR(addr + inline_room, + RTE_CACHE_LINE_SIZE); + copy_b = (addr_end > addr) ? + RTE_MIN((addr_end - addr), length) : 0; if (copy_b && ((end - (uintptr_t)raw) > copy_b)) { /* * One Dseg remains in the current WQE. To @@ -541,7 +543,7 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) if (unlikely(max_wqe < n)) break; max_wqe -= n; - if (tso) { + if (tso && !inl) { inl = rte_cpu_to_be_32(copy_b | MLX5_INLINE_SEG); rte_memcpy((void *)raw, @@ -576,11 +578,18 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) } else if (!segs_n) { goto next_pkt; } else { - /* dseg will be advance as part of next_seg */ - dseg = (volatile rte_v128u32_t *) - ((uintptr_t)wqe + - ((ds - 1) * MLX5_WQE_DWORD_SIZE)); - goto next_seg; + raw += copy_b; + inline_room -= copy_b; + --segs_n; + buf = buf->next; + assert(buf); + addr = rte_pktmbuf_mtod(buf, uintptr_t); + length = DATA_LEN(buf); +#ifdef MLX5_PMD_SOFT_COUNTERS + total_length += length; +#endif + (*txq->elts)[++elts_head & elts_m] = buf; + goto pkt_inline; } } else { /* @@ -639,12 +648,8 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) addr >> 32, }; (*txq->elts)[++elts_head & elts_m] = buf; - ++sg; - /* Advance counter only if all segs are successfully posted. */ - if (sg < segs_n) + if (--segs_n) goto next_seg; - else - j += sg; next_pkt: if (ds > MLX5_DSEG_MAX) { txq->stats.oerrors++; @@ -653,6 +658,7 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) ++elts_head; ++pkts; ++i; + j += sg; /* Initialize known and common part of the WQE structure. */ if (tso) { wqe->ctrl = (rte_v128u32_t){