From patchwork Thu Nov 15 10:29:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongseok Koh X-Patchwork-Id: 48113 X-Patchwork-Delegate: shahafs@mellanox.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 86E874CA2; Thu, 15 Nov 2018 11:29:19 +0100 (CET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50087.outbound.protection.outlook.com [40.107.5.87]) by dpdk.org (Postfix) with ESMTP id 13FDC4C95 for ; Thu, 15 Nov 2018 11:29:18 +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:X-MS-Exchange-SenderADCheck; bh=bev1uhl5IT7VcovHIv7YtrZtdpsB2RGRPVaxXZVuv1M=; b=Rku3bqZQIBAqjaBnfoSLGbmYH+QXWm1VmbOSbiZyfFMhOtwc9jfO4d6zhoDakfvvp7cjaiqgK2FvaPrfrPOvjfk75tgCWp1jw6AGHbnFg9v9ULRDfy2eF/OE8B0PbS2twUOx68NDhrVFxLCgKuGeTjEGNWnqKrudFJyJX6JOwXM= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB3963.eurprd05.prod.outlook.com (52.134.72.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.27; Thu, 15 Nov 2018 10:29:16 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::58e7:97d8:f9c1:4323]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::58e7:97d8:f9c1:4323%3]) with mapi id 15.20.1294.045; Thu, 15 Nov 2018 10:29:16 +0000 From: Yongseok Koh To: Shahaf Shuler CC: "dev@dpdk.org" , Yongseok Koh Thread-Topic: [PATCH 1/4] net/mlx4: optimize Tx external memory registration Thread-Index: AQHUfM4PBsIsC09Bz02hkPuPZscNWw== Date: Thu, 15 Nov 2018 10:29:16 +0000 Message-ID: <20181115102859.10928-1-yskoh@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR05CA0019.namprd05.prod.outlook.com (2603:10b6:a03:c0::32) To DB3PR0502MB3980.eurprd05.prod.outlook.com (2603:10a6:8:10::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [209.116.155.178] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB3PR0502MB3963; 6:dmajPLJjaMIIoqhr6GEp0zv0zNHJRdKEYhatfh54Wg+W/db2uqdua8eytbsx7zr1j5ZlCu1PLXUtDRby1Lt/r2ClAcjHdMyRgC2Lq8ejmnW5oJ6RxuxFWscgnbhA9+K9PbBtii9wMNfBcLJeC3UO7uLYbTEzUXDzcxo4h6uwPdGYWZjBLY/WLBwA00g4RTTM6AhvZ/DS/hFOpYlpU4la1tWs4D6PkfMCcZjh6kg/3BI61HO3wKmMGLPyG5ms1qpF0TSAtskWWxqeZwyv/PHgNMZUiGbKs+7iJIe58+cKaurRW72MG6EdjCY7VXLJ7+I1tBK9ezrRnfN/c7dCW82PJvZmPNUTo7V8XCjP373phGOAzRe7cl5vXlGVhzdpiD93kH9jvPa3dT5Zb/wtlokl0+ZYC+89sXwyhpkN2MnA8TA4ikGk5yCsrx+56l51Y2GbRalwZKNpbLpe9leJD6gRfg==; 5:+TmEt+6srhtnFoPEGS2Yr0GdASMauArASimOQepieYAX6wHhFXxB8eSkZ81gnoq9ERwoOu3SZu/I9df/VbQ0pFFWqKHDTvJglkMx6FSYafw4/9z9MXPVLkZlkXaTtzK6I3tv44L3Ln5k2hWrEAkL7laLxtzfr+QO3Q5Ce/qzOyo=; 7:Xhmm0ZqmYYRQsuQLhp9dWs4VlNpatNln5xy3cZ97pcD8d2MxQLWrxkmdlfgA5/zVzVU56pvbAY5HKDBdXQJmiGXmAAUHRP2mrG1uJpcsdxlJAw45AzzphU33vcYysO/8y8AEgnoji9tEtQiN/n+Q5A== x-ms-office365-filtering-correlation-id: 5f833451-c3af-4261-940e-08d64ae53194 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:DB3PR0502MB3963; x-ms-traffictypediagnostic: DB3PR0502MB3963: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231415)(944501410)(52105112)(10201501046)(3002001)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:DB3PR0502MB3963; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB3963; x-forefront-prvs: 08572BD77F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(376002)(39860400002)(396003)(366004)(136003)(189003)(199004)(102836004)(1076002)(186003)(316002)(6636002)(105586002)(6436002)(486006)(106356001)(107886003)(25786009)(5660300001)(386003)(6506007)(8936002)(81166006)(81156014)(68736007)(52116002)(6512007)(66066001)(36756003)(478600001)(2616005)(14454004)(53936002)(7736002)(4326008)(6862004)(71200400001)(71190400001)(8676002)(6486002)(97736004)(86362001)(575784001)(305945005)(99286004)(26005)(14444005)(476003)(54906003)(2900100001)(6116002)(3846002)(37006003)(2906002)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB3963; H:DB3PR0502MB3980.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: LhNX09qY8QUPTgS5CI05HKOWQVXjNquGiMvfHF4kOuEF410waPTi2wQNwZeIUmY3W0VDGU+ul5MDpWgu/2zYdz9zFz11mEld0vgNeZS1COgbbWJuIIlCDsxib7sOz4O0wKlm9GpFGkQm2fXZR4GFTdpQCET0w62IehKUNq6W4MH/UwgEyJY8E9JbxwFE6nwFjhR/HLBNuK255y4DaIRedTd6B94xSIJOA9MzYuR00YZpe9X6zEI51bP43X/OssxgYm7dlJiwJbx5gFTz1NyUhdZmKAV/XwDoX27M5xQo1U4TQRGiEzXfRXm8u/KhURtZUGa+7Z982AKeIBbi8c5w9luX+aBbrFBlw/gBhJZOizg= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f833451-c3af-4261-940e-08d64ae53194 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2018 10:29:16.4603 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB3963 Subject: [dpdk-dev] [PATCH 1/4] net/mlx4: optimize Tx external memory registration 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" There's some performance drop due to extra condition checks on the datapath. Checking for external memory registration should be consolidated to the existing bottom-half. Fixes: 31912d992403 ("net/mlx4: support externally allocated static memory") Signed-off-by: Yongseok Koh --- drivers/net/mlx4/mlx4_mr.c | 28 +++++++++++++++++++++++++++- drivers/net/mlx4/mlx4_rxtx.h | 26 ++++++-------------------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/drivers/net/mlx4/mlx4_mr.c b/drivers/net/mlx4/mlx4_mr.c index 726788a60d..a0094483ab 100644 --- a/drivers/net/mlx4/mlx4_mr.c +++ b/drivers/net/mlx4/mlx4_mr.c @@ -1042,7 +1042,7 @@ mlx4_rx_addr2mr_bh(struct rxq *rxq, uintptr_t addr) * @return * Searched LKey on success, UINT32_MAX on no match. */ -uint32_t +static uint32_t mlx4_tx_addr2mr_bh(struct txq *txq, uintptr_t addr) { struct mlx4_mr_ctrl *mr_ctrl = &txq->mr_ctrl; @@ -1054,6 +1054,32 @@ mlx4_tx_addr2mr_bh(struct txq *txq, uintptr_t addr) } /** + * Bottom-half of LKey search on Tx. If it can't be searched in the memseg + * list, register the mempool of the mbuf as externally allocated memory. + * + * @param txq + * Pointer to Tx queue structure. + * @param mb + * Pointer to mbuf. + * + * @return + * Searched LKey on success, UINT32_MAX on no match. + */ +uint32_t +mlx4_tx_mb2mr_bh(struct txq *txq, struct rte_mbuf *mb) +{ + uintptr_t addr = (uintptr_t)mb->buf_addr; + uint32_t lkey; + + lkey = mlx4_tx_addr2mr_bh(txq, addr); + if (lkey == UINT32_MAX && rte_errno == ENXIO) { + /* Mempool may have externally allocated memory. */ + return mlx4_tx_update_ext_mp(txq, addr, mlx4_mb2mp(mb)); + } + return lkey; +} + +/** * Flush all of the local cache entries. * * @param mr_ctrl diff --git a/drivers/net/mlx4/mlx4_rxtx.h b/drivers/net/mlx4/mlx4_rxtx.h index 1be060cda1..d7ec4e0c5f 100644 --- a/drivers/net/mlx4/mlx4_rxtx.h +++ b/drivers/net/mlx4/mlx4_rxtx.h @@ -162,7 +162,7 @@ void mlx4_tx_queue_release(void *dpdk_txq); void mlx4_mr_flush_local_cache(struct mlx4_mr_ctrl *mr_ctrl); uint32_t mlx4_rx_addr2mr_bh(struct rxq *rxq, uintptr_t addr); -uint32_t mlx4_tx_addr2mr_bh(struct txq *txq, uintptr_t addr); +uint32_t mlx4_tx_mb2mr_bh(struct txq *txq, struct rte_mbuf *mb); uint32_t mlx4_tx_update_ext_mp(struct txq *txq, uintptr_t addr, struct rte_mempool *mp); @@ -176,7 +176,7 @@ uint32_t mlx4_tx_update_ext_mp(struct txq *txq, uintptr_t addr, * @return * Memory pool where data is located for given mbuf. */ -static struct rte_mempool * +static inline struct rte_mempool * mlx4_mb2mp(struct rte_mbuf *buf) { if (unlikely(RTE_MBUF_INDIRECT(buf))) @@ -225,9 +225,10 @@ mlx4_rx_addr2mr(struct rxq *rxq, uintptr_t addr) * Searched LKey on success, UINT32_MAX on no match. */ static __rte_always_inline uint32_t -mlx4_tx_addr2mr(struct txq *txq, uintptr_t addr) +mlx4_tx_mb2mr(struct txq *txq, struct rte_mbuf *mb) { struct mlx4_mr_ctrl *mr_ctrl = &txq->mr_ctrl; + uintptr_t addr = (uintptr_t)mb->buf_addr; uint32_t lkey; /* Check generation bit to see if there's any change on existing MRs. */ @@ -238,23 +239,8 @@ mlx4_tx_addr2mr(struct txq *txq, uintptr_t addr) MLX4_MR_CACHE_N, addr); if (likely(lkey != UINT32_MAX)) return lkey; - /* Take slower bottom-half (binary search) on miss. */ - return mlx4_tx_addr2mr_bh(txq, addr); -} - -static __rte_always_inline uint32_t -mlx4_tx_mb2mr(struct txq *txq, struct rte_mbuf *mb) -{ - uintptr_t addr = (uintptr_t)mb->buf_addr; - uint32_t lkey = mlx4_tx_addr2mr(txq, addr); - - if (likely(lkey != UINT32_MAX)) - return lkey; - if (rte_errno == ENXIO) { - /* Mempool may have externally allocated memory. */ - lkey = mlx4_tx_update_ext_mp(txq, addr, mlx4_mb2mp(mb)); - } - return lkey; + /* Take slower bottom-half on miss. */ + return mlx4_tx_mb2mr_bh(txq, mb); } #endif /* MLX4_RXTX_H_ */ From patchwork Thu Nov 15 10:29:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongseok Koh X-Patchwork-Id: 48114 X-Patchwork-Delegate: shahafs@mellanox.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 5E6EA4D27; Thu, 15 Nov 2018 11:29:21 +0100 (CET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50050.outbound.protection.outlook.com [40.107.5.50]) by dpdk.org (Postfix) with ESMTP id DA3394C95 for ; Thu, 15 Nov 2018 11:29:18 +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:X-MS-Exchange-SenderADCheck; bh=cFIMQVF0u2bJRlKN0ppbNYl5dOHl5EgFOnn/GIBcNqg=; b=gdKwQkhHgYkNIE9fHMcN2XNf3tgtCJ1Tv0HzHbqnNGeLpJ+vGlY5V6HQnvyI4cyVPDU8GUDZ2ZL3urk+Dc8nbsL7VMeQV8Cn/4twUAVNTW84GezODPxmFT/4ZtuJ1Mafe+DpurovA9ey5vBveJDFUe6vrza7bIMU5Spod0NkB1w= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB3963.eurprd05.prod.outlook.com (52.134.72.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.27; Thu, 15 Nov 2018 10:29:17 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::58e7:97d8:f9c1:4323]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::58e7:97d8:f9c1:4323%3]) with mapi id 15.20.1294.045; Thu, 15 Nov 2018 10:29:17 +0000 From: Yongseok Koh To: Shahaf Shuler CC: "dev@dpdk.org" , Yongseok Koh Thread-Topic: [PATCH 2/4] net/mlx5: optimize Tx external memory registration Thread-Index: AQHUfM4Q9dydNzIS1kGOolcWPMHceA== Date: Thu, 15 Nov 2018 10:29:17 +0000 Message-ID: <20181115102859.10928-2-yskoh@mellanox.com> References: <20181115102859.10928-1-yskoh@mellanox.com> In-Reply-To: <20181115102859.10928-1-yskoh@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR05CA0019.namprd05.prod.outlook.com (2603:10b6:a03:c0::32) To DB3PR0502MB3980.eurprd05.prod.outlook.com (2603:10a6:8:10::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [209.116.155.178] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB3PR0502MB3963; 6:Ml2YtLnHYtG7YZCs10YdBeL+ViHHGKouyFi5p6umpksIB0lS6PkW8q+4lGvhEFhkbM2SvqCijCMQny52+T92itOgPdTfkITsVooKJR+li/4yTjmjW7B646FhwmWpw3sCayGnfHTBGIi6FXy/zvTM76u1UVB/cMPJsPpv0ico8Cbcs7hYG/AP+Ta0K4jNbce/PTvUnB6kKBa8sOrV/6NeHDoE1OJXIE5QGUDsG/5eM6qdQ4Qv49XXvkI2IYvdSAXcXEnlV0uMYRWa6dUG0/N+YdeVOEYeFqAeHKUasqGRjeQEO0qOfwz8D6oWLLA6TF8M3Ud+UZN8/glP1JERzuhW5D/837zwtlIN5Te8ycPKEdD58gL2zWeZWQ6uyWMtfooPXdHtpCRP3NR9TmirB13s5FVALlL+jT6lnrQJiUWqNODvuN27pPxcZKEmwcOAHfd75LcfwkClcSN2qX21cIqEww==; 5:PWZZTJqpGKa/Hj3B8zP28YcFYqJVIJd74H2lc7rGDdEBt0+9TZBU11ajrXwTkyyxnlLS5rDBg0kNQFUfV53KMpQR0q/jubavLaHV1F9rmn7Gjl/lTQxxK1YNfAxBjo6ckuIu8UXJOJFItLbW001z8OGj3j02++bv8pWMZz+lGOI=; 7:+y64t0FfHx4HNSNG/2Y/s13QftXJXxK7f80AxA/F+h9S8rpftbyqEKjat7kcD2QxVUHDSJ14vV0J8L/cWUpttoMZ7yytyGt9mVpaJYRnPEc60y1r4nEZPbEuamzfUN5PAepN8Wm+l9VsA41ZqvYxFQ== x-ms-office365-filtering-correlation-id: 4e3c89a7-450e-4d7c-c5c9-08d64ae53268 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:DB3PR0502MB3963; x-ms-traffictypediagnostic: DB3PR0502MB3963: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231415)(944501410)(52105112)(10201501046)(3002001)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:DB3PR0502MB3963; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB3963; x-forefront-prvs: 08572BD77F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(376002)(39860400002)(396003)(366004)(136003)(189003)(199004)(102836004)(1076002)(186003)(316002)(6636002)(105586002)(6436002)(486006)(106356001)(107886003)(25786009)(11346002)(5660300001)(386003)(6506007)(8936002)(81166006)(81156014)(68736007)(52116002)(6512007)(66066001)(36756003)(478600001)(2616005)(14454004)(53936002)(7736002)(4326008)(6862004)(71200400001)(71190400001)(8676002)(6486002)(97736004)(86362001)(305945005)(99286004)(26005)(14444005)(476003)(54906003)(2900100001)(6116002)(3846002)(446003)(37006003)(2906002)(76176011)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB3963; H:DB3PR0502MB3980.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: GUXLD1zIu+/VsKh9hiETRyKN8VESPBh2eyH7ezB0jh/G0aYr/JUF10KApUx7gwKjlT5DsliGGTHgIbk+daPlV/BHdWYb5pInlXkCscSpc4Vm10h4RsMyAZU8+0U6nNqNMRKq5WLjDuhJoKq83VEwXGED8v/JEXkkewfuS1tG1hmJ9D8gquvub7L1m8MLzm2/1o34IGIdA/Tb1cTnl5t+kGFmtwStitmmQ5k0vY6O1WLEEn3kM7U2jT3YYmpUjDmabxzVam0fCsPTOic86GtlBjE01bTOdCLkMFG7KIFR1/q5WjlkoF1SrO/9eeOMTvvPHJLnwil6UXVbRKQ0w6iID/wSTlW+qFiwDciL3bMSpbM= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e3c89a7-450e-4d7c-c5c9-08d64ae53268 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2018 10:29:17.8666 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB3963 Subject: [dpdk-dev] [PATCH 2/4] net/mlx5: optimize Tx external memory registration 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" There's some performance drop due to extra condition checks on the datapath. Checking for external memory registration should be consolidated to the existing bottom-half. Fixes: 7e43a32ee060 ("net/mlx5: support externally allocated static memory") Signed-off-by: Yongseok Koh --- drivers/net/mlx5/mlx5_mr.c | 28 +++++++++++++++++++++++++++- drivers/net/mlx5/mlx5_rxtx.h | 26 ++++++-------------------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c index 6d7653d7d6..442b2d2321 100644 --- a/drivers/net/mlx5/mlx5_mr.c +++ b/drivers/net/mlx5/mlx5_mr.c @@ -1045,7 +1045,7 @@ mlx5_rx_addr2mr_bh(struct mlx5_rxq_data *rxq, uintptr_t addr) * @return * Searched LKey on success, UINT32_MAX on no match. */ -uint32_t +static uint32_t mlx5_tx_addr2mr_bh(struct mlx5_txq_data *txq, uintptr_t addr) { struct mlx5_txq_ctrl *txq_ctrl = @@ -1060,6 +1060,32 @@ mlx5_tx_addr2mr_bh(struct mlx5_txq_data *txq, uintptr_t addr) } /** + * Bottom-half of LKey search on Tx. If it can't be searched in the memseg + * list, register the mempool of the mbuf as externally allocated memory. + * + * @param txq + * Pointer to Tx queue structure. + * @param mb + * Pointer to mbuf. + * + * @return + * Searched LKey on success, UINT32_MAX on no match. + */ +uint32_t +mlx5_tx_mb2mr_bh(struct mlx5_txq_data *txq, struct rte_mbuf *mb) +{ + uintptr_t addr = (uintptr_t)mb->buf_addr; + uint32_t lkey; + + lkey = mlx5_tx_addr2mr_bh(txq, addr); + if (lkey == UINT32_MAX && rte_errno == ENXIO) { + /* Mempool may have externally allocated memory. */ + return mlx5_tx_update_ext_mp(txq, addr, mlx5_mb2mp(mb)); + } + return lkey; +} + +/** * Flush all of the local cache entries. * * @param mr_ctrl diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index 1b6200f6c8..59fb43fefe 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -363,7 +363,7 @@ uint16_t mlx5_rx_burst_vec(void *dpdk_txq, struct rte_mbuf **pkts, void mlx5_mr_flush_local_cache(struct mlx5_mr_ctrl *mr_ctrl); uint32_t mlx5_rx_addr2mr_bh(struct mlx5_rxq_data *rxq, uintptr_t addr); -uint32_t mlx5_tx_addr2mr_bh(struct mlx5_txq_data *txq, uintptr_t addr); +uint32_t mlx5_tx_mb2mr_bh(struct mlx5_txq_data *txq, struct rte_mbuf *mb); uint32_t mlx5_tx_update_ext_mp(struct mlx5_txq_data *txq, uintptr_t addr, struct rte_mempool *mp); @@ -619,7 +619,7 @@ mlx5_tx_complete(struct mlx5_txq_data *txq) * @return * Memory pool where data is located for given mbuf. */ -static struct rte_mempool * +static inline struct rte_mempool * mlx5_mb2mp(struct rte_mbuf *buf) { if (unlikely(RTE_MBUF_INDIRECT(buf))) @@ -668,9 +668,10 @@ mlx5_rx_addr2mr(struct mlx5_rxq_data *rxq, uintptr_t addr) * Searched LKey on success, UINT32_MAX on no match. */ static __rte_always_inline uint32_t -mlx5_tx_addr2mr(struct mlx5_txq_data *txq, uintptr_t addr) +mlx5_tx_mb2mr(struct mlx5_txq_data *txq, struct rte_mbuf *mb) { struct mlx5_mr_ctrl *mr_ctrl = &txq->mr_ctrl; + uintptr_t addr = (uintptr_t)mb->buf_addr; uint32_t lkey; /* Check generation bit to see if there's any change on existing MRs. */ @@ -681,23 +682,8 @@ mlx5_tx_addr2mr(struct mlx5_txq_data *txq, uintptr_t addr) MLX5_MR_CACHE_N, addr); if (likely(lkey != UINT32_MAX)) return lkey; - /* Take slower bottom-half (binary search) on miss. */ - return mlx5_tx_addr2mr_bh(txq, addr); -} - -static __rte_always_inline uint32_t -mlx5_tx_mb2mr(struct mlx5_txq_data *txq, struct rte_mbuf *mb) -{ - uintptr_t addr = (uintptr_t)mb->buf_addr; - uint32_t lkey = mlx5_tx_addr2mr(txq, addr); - - if (likely(lkey != UINT32_MAX)) - return lkey; - if (rte_errno == ENXIO) { - /* Mempool may have externally allocated memory. */ - lkey = mlx5_tx_update_ext_mp(txq, addr, mlx5_mb2mp(mb)); - } - return lkey; + /* Take slower bottom-half on miss. */ + return mlx5_tx_mb2mr_bh(txq, mb); } /** From patchwork Thu Nov 15 10:29:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongseok Koh X-Patchwork-Id: 48115 X-Patchwork-Delegate: shahafs@mellanox.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 8697A4F9C; Thu, 15 Nov 2018 11:29:23 +0100 (CET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50062.outbound.protection.outlook.com [40.107.5.62]) by dpdk.org (Postfix) with ESMTP id 6D89C4CC5; Thu, 15 Nov 2018 11:29:20 +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:X-MS-Exchange-SenderADCheck; bh=Gv74Q5yo7sQdvGJjjEqbNe05GUJA9Vtxxqbec6K1+aE=; b=CybXFpcYvou+kLS1T42ieNu4P/g7V1rhcb21by7pL9lX+DOHdvvGfueFyx4ZSTMueVOsysLbP4RbcBrTT3IExOHBoYX8EpmjHM0XQT/hhtJK0MXyC4Vz5jL68BRJ0GU7vlva2DATz+wu5BdUfqvbSBxN5sGwuIP36m2eSIPFqA8= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB3963.eurprd05.prod.outlook.com (52.134.72.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.27; Thu, 15 Nov 2018 10:29:19 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::58e7:97d8:f9c1:4323]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::58e7:97d8:f9c1:4323%3]) with mapi id 15.20.1294.045; Thu, 15 Nov 2018 10:29:19 +0000 From: Yongseok Koh To: Shahaf Shuler CC: "dev@dpdk.org" , Yongseok Koh , "stable@dpdk.org" Thread-Topic: [PATCH 3/4] net/mlx5: optimize Tx doorbell write Thread-Index: AQHUfM4Qa+rvfHCNUUiUI1OyUjCB7A== Date: Thu, 15 Nov 2018 10:29:19 +0000 Message-ID: <20181115102859.10928-3-yskoh@mellanox.com> References: <20181115102859.10928-1-yskoh@mellanox.com> In-Reply-To: <20181115102859.10928-1-yskoh@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR05CA0019.namprd05.prod.outlook.com (2603:10b6:a03:c0::32) To DB3PR0502MB3980.eurprd05.prod.outlook.com (2603:10a6:8:10::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [209.116.155.178] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB3PR0502MB3963; 6:yhzvCcc0DXHBfDoJtdZJf8YkCyB3XMsUWn4lMMDPiNbyTuzvKQSVeK1OQ2Pg+huC+ICY7UngsHzO/FbVM78cFd0gS83s44DdmF0xJpbwR6bxSdI7834T3NErw2We95GLs2xfIePQ2PyEc2N/T1qEQlyLS2qrFyFEQ0HNZcK6X8Oj2twS8dYvWW/u121NNgq3jAQrlpZTkmphnjK21vNizQrBMJnS06XVbd/SH2EA1l25BhwCR2hbzo+5+rKUSAzoe5jv+OOk5rxzrhLnglpZiK8b/SSmcsOKb+YmZO6GEZ7uyNbIL9K+bljvhtahlWXBUmALj1qIRwBK8NngY65XF96QwiYp/VZrq8/Ob24GXodVxBB1qF4eg/YOmlwy/tk8C1+GZFCB4nk2mS0FFWdlvPSXcpEuYPZp6bNuugQS4fJ5UFx/MFWUz5ta7Fz85Z6GsCrnVpYqZwpeBseC+MHmnA==; 5:KwhfdGGmYqSH08aJ2lBIYyrc9fwBCJsCCUAU7S2renMaOA+mwMpyePTJPEs93MxVwghXSxBT2246n7BokOmCc2us691HtLkq5QaPvW9ecY/fWU3+0aoAl13G0wUYaofDPdpQOdqERWbik2qxhudXEPOWJ2Cd7IPNDMz9iaoLgAw=; 7:maxvDAUN0lNOKzTOcEnlWj4xhXUVrOj4j7hbRqTXNv/LP+iLaV3zC8Q44O5Wn7mfdoH4PcxDa9TP7/1L/WVa8iLh1+IwOsXuJtJWE9a9e4y0gQSuiVI51cGJKEkhH6SpH2eMijtA7BScGlp8Zwf3fQ== x-ms-office365-filtering-correlation-id: ca960453-5784-466e-cf14-08d64ae53354 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:DB3PR0502MB3963; x-ms-traffictypediagnostic: DB3PR0502MB3963: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231415)(944501410)(52105112)(10201501046)(3002001)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:DB3PR0502MB3963; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB3963; x-forefront-prvs: 08572BD77F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(376002)(39860400002)(396003)(366004)(136003)(189003)(199004)(102836004)(1076002)(186003)(316002)(6636002)(105586002)(6436002)(486006)(106356001)(25786009)(11346002)(5660300001)(386003)(6506007)(8936002)(81166006)(81156014)(68736007)(52116002)(6512007)(66066001)(36756003)(478600001)(2616005)(14454004)(53936002)(7736002)(4326008)(6862004)(71200400001)(71190400001)(8676002)(6486002)(97736004)(86362001)(305945005)(99286004)(450100002)(26005)(14444005)(476003)(54906003)(2900100001)(6116002)(3846002)(446003)(37006003)(2906002)(76176011)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB3963; H:DB3PR0502MB3980.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: wWLKOuaH7k1B7k1k5gMrtgYuYK/rBkwtLEbz4AtoijJddgN4ga5FhZOgvizjflOoC9zpOIaMtFNuZMO4PqYBKwMYqARUtj9fe9Jdaz8QPzKp9xAGaIBqMWv+IpNWysi/wK2q+Scu9AKdP0ZwYZdcm15cerBGm1G7hIiRrs/u6vQchMS0/Q1Oaal5xwOnwtOCbqcki60xUVh1kjES3NCilXxSuT1xc7zcTCBriTHfqGOW6esaXl4O7RZT+kQY4LHuXaoxL2OQbDbZByUkhcN8hgunmW/Lpi+ZAxEigHj6NCgycz4HJpVIPBHedcPcSlfQxY3EufVEePLYHd1bfwUv6UdFqnVJIC7x4Onkj5SXtFY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca960453-5784-466e-cf14-08d64ae53354 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2018 10:29:19.1166 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB3963 Subject: [dpdk-dev] [PATCH 3/4] net/mlx5: optimize Tx doorbell write 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" Unnecessary volatile attribute keeps compiler from further optimizing the code and this results in a little performance drop (~2%). Because of memory barriers, it is safe to remove. Fixes: 6bf10ab69be0 ("net/mlx5: support 32-bit systems") Cc: stable@dpdk.org Signed-off-by: Yongseok Koh --- drivers/net/mlx5/mlx5_rxtx.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index 59fb43fefe..e210453fe0 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -379,17 +379,16 @@ uint32_t mlx5_tx_update_ext_mp(struct mlx5_txq_data *txq, uintptr_t addr, * Address of the lock to use for that UAR access. */ static __rte_always_inline void -__mlx5_uar_write64_relaxed(uint64_t val, volatile void *addr, +__mlx5_uar_write64_relaxed(uint64_t val, void *addr, rte_spinlock_t *lock __rte_unused) { #ifdef RTE_ARCH_64 - rte_write64_relaxed(val, addr); + *(uint64_t *)addr = val; #else /* !RTE_ARCH_64 */ rte_spinlock_lock(lock); - rte_write32_relaxed(val, addr); + *(uint32_t *)addr = val; rte_io_wmb(); - rte_write32_relaxed(val >> 32, - (volatile void *)((volatile char *)addr + 4)); + *((uint32_t *)addr + 1) = val >> 32; rte_spinlock_unlock(lock); #endif } @@ -407,7 +406,7 @@ __mlx5_uar_write64_relaxed(uint64_t val, volatile void *addr, * Address of the lock to use for that UAR access. */ static __rte_always_inline void -__mlx5_uar_write64(uint64_t val, volatile void *addr, rte_spinlock_t *lock) +__mlx5_uar_write64(uint64_t val, void *addr, rte_spinlock_t *lock) { rte_io_wmb(); __mlx5_uar_write64_relaxed(val, addr, lock); From patchwork Thu Nov 15 10:29:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongseok Koh X-Patchwork-Id: 48116 X-Patchwork-Delegate: shahafs@mellanox.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 7DE2158CB; Thu, 15 Nov 2018 11:29:25 +0100 (CET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50063.outbound.protection.outlook.com [40.107.5.63]) by dpdk.org (Postfix) with ESMTP id 7F84F4F90; Thu, 15 Nov 2018 11:29:21 +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:X-MS-Exchange-SenderADCheck; bh=NrBWGctRwgjOsq7gfCzZMVN5YXCjwB1zupiKtY3o9zk=; b=DyQN+J/eDJi65hCVuh0yrTsGrBajdkE2RM93i2HrDvMTbnK1WpgD15CScttxbnHb+Cy6B8Zzf2p46VSiiJ9HABDhrtuzRgjqV1FkBj2jvPadcUs5bdcSNi3d8kQRE0XyQc6ZbYhJkV8Pm9Nvurt6uFV2gAFkCIVOYbvjOCmOa14= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB3963.eurprd05.prod.outlook.com (52.134.72.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.27; Thu, 15 Nov 2018 10:29:20 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::58e7:97d8:f9c1:4323]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::58e7:97d8:f9c1:4323%3]) with mapi id 15.20.1294.045; Thu, 15 Nov 2018 10:29:20 +0000 From: Yongseok Koh To: Shahaf Shuler CC: "dev@dpdk.org" , Yongseok Koh , "stable@dpdk.org" Thread-Topic: [PATCH 4/4] net/mlx5: optimize Rx buffer replenishment threshold Thread-Index: AQHUfM4Rp14hgR7JVEGch8K1Os8ARw== Date: Thu, 15 Nov 2018 10:29:20 +0000 Message-ID: <20181115102859.10928-4-yskoh@mellanox.com> References: <20181115102859.10928-1-yskoh@mellanox.com> In-Reply-To: <20181115102859.10928-1-yskoh@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR05CA0019.namprd05.prod.outlook.com (2603:10b6:a03:c0::32) To DB3PR0502MB3980.eurprd05.prod.outlook.com (2603:10a6:8:10::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [209.116.155.178] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB3PR0502MB3963; 6:MpzE2OG3Cb2vIQLSabskWkdV1WMr/nph7/GQua785hrL5G+f5KE2c+v8DPtoYtuPxUwXSoRrPzWjLFp9utvmnyZbrQu4WH7v5x8dYbTJJl0eYmEWgxfaXc8UHfwdLkoPKSPrQYkLO9l1id9dgbQFTIX5FUIn0wuC8b8pTIBXFqk9FG+7N+Bf3jPr47YLJRtkKlT0vnlKT9sxxC78Mr5HZYH/HWaw0Gr7MTYsbsePme1+GVAmIi6xqUJc/6USX5QfVxIC6iWTe3gQdZIWoRuwZRjQGsQV4U6CbiRsNxjkDuSqI5BH65HyWiRSFxOecEL/h2cUP1SDP8PJ2GjL+6KydQ3bzYx+67swcUfYVt07kfVHitqlnACUHD3gMsJL1wHS0waxFSXZJR1Eovsb7GXxgAAPYaEZ/6wVhs/QkrYcBHwV+YDsG25QAQ0ss7y/gdTcZuQ4ZG3R+uh95TYrmBkofA==; 5:cxI/ceZ6Mi3LujjcsPRk2fuLM1DijJdP5ysG0rvHVLxQBo7OmfrZN+PhOl8xRoYP8JObo2JRBscT5yvWncksk/nqVqf4Bdzn3ISAwU3XhX2JAEQSzjLZOBwZgtm+Yu0ktttGvP/eVeIrDA1sLlQqLv1NzAOrSE+xXqH1nccz6JY=; 7:5SE8rbaYm7bEIF8Ov04Oqs9O3yI7zuBpf4/pHSvBFVGhP7/vVG/ba5eIxm/SIinLKVu85hkX2urX2L93olI0tRtslZdXxGrvNg1N9X5/r60CEbiEkW5hJ8wT2kKMgXPLIvSagCgFKURh5+lABE2lFQ== x-ms-office365-filtering-correlation-id: 26ec638a-3794-476e-edf5-08d64ae53415 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:DB3PR0502MB3963; x-ms-traffictypediagnostic: DB3PR0502MB3963: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231415)(944501410)(52105112)(10201501046)(3002001)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:DB3PR0502MB3963; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB3963; x-forefront-prvs: 08572BD77F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(376002)(39860400002)(396003)(366004)(136003)(189003)(199004)(102836004)(1076002)(186003)(316002)(6636002)(105586002)(6436002)(486006)(106356001)(25786009)(11346002)(5660300001)(386003)(6506007)(8936002)(81166006)(81156014)(68736007)(52116002)(6512007)(66066001)(36756003)(478600001)(2616005)(14454004)(53936002)(7736002)(4326008)(6862004)(71200400001)(71190400001)(8676002)(6486002)(97736004)(86362001)(575784001)(305945005)(99286004)(450100002)(26005)(476003)(54906003)(2900100001)(6116002)(3846002)(446003)(37006003)(2906002)(76176011)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB3963; H:DB3PR0502MB3980.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: mzsi47Dtc86JjS4Fj4DV1zY3xampO2NEKXw2LpDvRtazxbpTgndLR22hBT+9Pe7Rr3ZUlTWDNzyo7tmZx5mtmg6PSWrpn+pX+BbuMC0Vad9suFsVRgQFgAZIvXO8bVvRdERBqYwHJsFecmMnAuS9n6a2LEENsOgjT1mlTkdY1WoBKPRPpwCAqMazEi0RRqVCvqXm7d0G+0p6S1+VrR64u0x1c9Z4z7wRQjtSD2CPN4OT2Gqen1EJGH14VTWLbOPfGjmL7hwlxNNYfjqGfrDrmmdHTceteu7RNTi694lm7rIHrqvI/JlnkJD+jYF0b59y+A3tOlxPKnIrXje4LY9UY30Y6WYiu9wOeKkB8Ub9Q/w= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26ec638a-3794-476e-edf5-08d64ae53415 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2018 10:29:20.3666 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB3963 Subject: [dpdk-dev] [PATCH 4/4] net/mlx5: optimize Rx buffer replenishment threshold 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" Due to redundant calculation per every burst, performance drops a little. Fixes: e10245a13b2e ("net/mlx5: fix Rx buffer replenishment threshold") Cc: stable@dpdk.org Signed-off-by: Yongseok Koh --- drivers/net/mlx5/mlx5_rxq.c | 2 ++ drivers/net/mlx5/mlx5_rxtx.h | 1 + drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 2 +- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index b27fc4798d..183da0e282 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1468,6 +1468,8 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, tmpl->rxq.mp = mp; tmpl->rxq.stats.idx = idx; tmpl->rxq.elts_n = log2above(desc); + tmpl->rxq.rq_repl_thresh = + MLX5_VPMD_RXQ_RPLNSH_THRESH(1 << tmpl->rxq.elts_n); tmpl->rxq.elts = (struct rte_mbuf *(*)[1 << tmpl->rxq.elts_n])(tmpl + 1); #ifndef RTE_ARCH_64 diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index e210453fe0..f47d327cfb 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -101,6 +101,7 @@ struct mlx5_rxq_data { uint16_t consumed_strd; /* Number of consumed strides in WQE. */ uint32_t rq_pi; uint32_t cq_ci; + uint16_t rq_repl_thresh; /* Threshold for buffer replenishment. */ struct mlx5_mr_ctrl mr_ctrl; /* MR control descriptor. */ uint16_t mprq_max_memcpy_len; /* Maximum size of packet to memcpy. */ volatile void *wqes; diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h index 0b729f1859..883fe1bf91 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h @@ -732,7 +732,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, * N - (rq_ci - rq_pi) := # of buffers consumed (to be replenished). */ repl_n = q_n - (rxq->rq_ci - rxq->rq_pi); - if (repl_n >= MLX5_VPMD_RXQ_RPLNSH_THRESH(q_n)) + if (repl_n >= rxq->rq_repl_thresh) mlx5_rx_replenish_bulk_mbuf(rxq, repl_n); /* See if there're unreturned mbufs from compressed CQE. */ rcvd_pkt = rxq->cq_ci - rxq->rq_pi; diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h index e0f95f923d..14117c4bb4 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h @@ -716,7 +716,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, * N - (rq_ci - rq_pi) := # of buffers consumed (to be replenished). */ repl_n = q_n - (rxq->rq_ci - rxq->rq_pi); - if (repl_n >= MLX5_VPMD_RXQ_RPLNSH_THRESH(q_n)) + if (repl_n >= rxq->rq_repl_thresh) mlx5_rx_replenish_bulk_mbuf(rxq, repl_n); /* See if there're unreturned mbufs from compressed CQE. */ rcvd_pkt = rxq->cq_ci - rxq->rq_pi;