From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0088.outbound.protection.outlook.com [104.47.2.88]) by dpdk.org (Postfix) with ESMTP id 2D69F1B314; Sun, 22 Oct 2017 10:00:51 +0200 (CEST) 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=5ddbzMx4F238iXkpouLpTiLjZWR+isWBkS/XHTAGj40=; b=DQ4xe6IFyZlCitflkqwQIS6ul/q/nzrrK7DoPXEcyPeyghVUQkI5xo7eJfmf1Nu4+pORtJZsWFiN1edBK4Tpkqo03SItO4lIl3ueO/3PhWzq+wNb35B9ZWanApGSO/qCy3On0m1YYNuidni13RAs1bN6BfV1CtBbRzGwSNqfAZM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by HE1PR0501MB2041.eurprd05.prod.outlook.com (2603:10a6:3:35::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Sun, 22 Oct 2017 08:00:47 +0000 From: Yongseok Koh To: adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Cc: dev@dpdk.org, Yongseok Koh , stable@dpdk.org, Sagi Grimberg , Alexander Solganik Date: Sun, 22 Oct 2017 01:00:22 -0700 Message-Id: <20171022080022.13528-1-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: YQBPR0101CA0004.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00::17) To HE1PR0501MB2041.eurprd05.prod.outlook.com (2603:10a6:3:35::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 22f60c23-d616-4938-3c3b-08d519230245 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199); SRVR:HE1PR0501MB2041; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2041; 3:ZX2JnK8afyoi4sH3XoK7vv4HnXL6f73qlU+OhVxgGkeFVLZumk4ZMHuzQuRrTTtOnAQkRfupzM6B8glciSObB9ijq+hNBOvHlNePIhS0WtlIw7tHFlrncoKoR6OpSXgepZ3uHZcI06JuI/u9u+L3Cm+kCZ5viZuQyGDgq1tDVB1jTXwIidwx8Adc/DQGpPJAaLyPnTuylgXpBHovFRIJ3g09Ffy6FJowtTlWcBlHY4sH5KAbHebZMaGlb13r/+nf; 25:AUXrULwE7GWZN4mW9Bkt92t7Z5sdf7sMFKkeXufA80dSiS2RIDUnk2BXQ2z/dXOtqf//9F4vAY/yPxNrpZfuaYRQIRlwNal9j3aWPedQNm05qQWBBM/9NCUKZz3iEXh6NoIQOifjhRmCoQhgT1i/IhJ9Plt9y2aiDWMyMVQ9N//QKH03p3v2irvEGkEgJ6nn9S2zZ3MiwubwwPNLjNHu6BSvnMv42h3BhNa0dT3mZws1RndPWnUVR/Sxo4WfpHKIEI2ts9B01ErQOYmwJAuBXCaPyvfbgjgSuMYl3fJno1l5/xwwXZFiZOynucEz6gxlgKbl6buGkDmToHfeHnR0Cg==; 31:gCP+CyYdkT13Abwqs8wNl0ENqVu8WbjI1QUVwU6O3tRFASQt1FP37bN/Wuy0VKNaUK9oK/dKbudTFsYj+Nm082Qgj4y3yctWRakILQ3jrgdQ7n6O68RQrInwT+bMvNWZpIvoY7pp4qBGhnx4+oSBZJXfOBtqTL3+0P2vkiGhfkTT6itGs/1eh57agQdRKW6WSszUI0Yf0PYBc3K6DKfC5GPTKNyw7fPfCfwgVVHtUgs= X-MS-TrafficTypeDiagnostic: HE1PR0501MB2041: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2041; 20:7pqa7CVM7BigSDymtcUvgREI9piVnvjnfmZkEw5a2yWBnwpaGFI8PrcbzFbxRsLgT1DAGQB33cTQcxwcB4QC4BiCwiufDShdj9lOu1P+j3eIJ46NjyaD3gFBLZyN9JKIJueEHMKI3UtbVJhc065B5AZjsuN52en4yqaegx9LzWGXY8p232de4xNqyOBeRjnVdMBtq9KM+oP5pdT61DMxTadq7SwsZCh63bjUMWkZW+dqsnCV1FdsZ7qwDp8kf9EvJVf9i1Oc+LtA7TzGmW5JFPpHR0X4uMKPQxvE+5NqkxaSg+hgCFLYAFVE6SePL3NIm0im6JRcdAVut5wOsR5c/cc3vJ+qzBZPDvrDUReBbx/qyPRaFxNIe6rW7jEWoONX/JLvqQtiQI1U+CQahWt55/ZWb3yy+yfOA7DuSbSjjY9ks4IdkkbCzVI8C/NAgi+P07kGGYa0l2X31XWUnK73C25A7CIDXZSKTSykQjOQ1d6CpL/RpzX8pdecaeVrG4WE; 4:gWw/4JAxePkRfyVk/BDXAHYgW1etdfqnXUk0wPbKMUXW/wMgv8Mo6iM8b9Z0i+EKlYJXErt4uoyZz8QI0sfHO0PeL9TSljoFm3W2T3IH2k89Xm1+NbPEEEWKoOHZv+5C8/4v6eX3NPaHYws3AP/AQNsGms1OYlIvw7deIaaPV3dU7hB8Ju06bYNhIo8zxLWVoC31q+c37N+pksYL+D2II7aqelD9JJvA3MI5fN4F9jWx0U2DVL8u4HpIzv2VfOAR X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231020)(3002001)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:HE1PR0501MB2041; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:HE1PR0501MB2041; X-Forefront-PRVS: 0468FE4A2B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(346002)(376002)(199003)(189002)(21086003)(7736002)(305945005)(2906002)(478600001)(68736007)(25786009)(48376002)(8936002)(316002)(54906003)(50466002)(39060400002)(4326008)(6666003)(16586007)(101416001)(50986999)(33646002)(53936002)(97736004)(6116002)(3846002)(1076002)(86362001)(105586002)(69596002)(189998001)(106356001)(5003940100001)(55016002)(8676002)(36756003)(81156014)(81166006)(47776003)(5660300001)(66066001)(16526018)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0501MB2041; 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; HE1PR0501MB2041; 23:Jp7Pa2Qy+yIXh0V0H0XnAUW4nTXfjo7qFbUTYV6?= =?us-ascii?Q?H2hqtoXip0tyZdXpBdQWuyxAuOu7JCilVOYnKJaktXAdewl5hzMYRAnFu59+?= =?us-ascii?Q?BKJJUYG7j8u8rOGAkM9/AiI2KQEQxxh/zryrfbGku/ZnN7Sow0ofdCctVaz4?= =?us-ascii?Q?Mk9NE/cvy2ZZtGelgI9dg1144g423Zj7rtdfFRYikgH6oHwVf8sxffsy5NXq?= =?us-ascii?Q?G0MAdy+dnnutqk2TVa9cAwzvvMVrWMsUNGPyORfgjF/Xd2qXduSL6wdNzVW3?= =?us-ascii?Q?64EHkfRPgFh9v6xjfkliaAPJEe9fanCueh/WK0yf1JRrATp5Em6yO73ipJvw?= =?us-ascii?Q?9FLiRtIEgOHu7fuR6Ab7lGz8QJlSAD7CTrAY0/M1O+QxT4EM5DsMt1eDlhsN?= =?us-ascii?Q?BvQvNG+KQs8MpGEeqJVr7dCdWsE5WjOtinwpKtHZxMLJBnUm/UsS6Inl0IKf?= =?us-ascii?Q?AbcjhcWuqyjozyvTZ+4Y6P7Sy/2WL8cZQkSrSoZX2BRXS46SOKNbNis3YDcp?= =?us-ascii?Q?iakNbUJ/dbnY3L7v/jc4r9aDfljBjS+ZZ8U2ED8KSCJwSyqsmgPFFFJU/pXi?= =?us-ascii?Q?vED9NSqvImDdHaYXJHLP86JDlqLDUD2/F/zNy180Lu/Dd0ikvXK/0KvGq7og?= =?us-ascii?Q?qhAIxmTRuCOBDildVod1Pmz0efsZ1hcSig7GQOufpPf5Hfp3R0QP97H5UyDx?= =?us-ascii?Q?9H2dqRE+ecspune6vXIoszpsi6c5AAshZhwdTiluv7NZhRcBr6qmdjMSLEUz?= =?us-ascii?Q?DQRLMiRP0t8M0T2EHMPLQqUWgMwZcJZrPoGxe076Z/d5QPoJJjx6UgS+rb8I?= =?us-ascii?Q?eX1Mi3zdTIL77b6VLlvtEx+9WwFMPYSQHomL9wn/QkeEX2ZZsfXWCmAei4wi?= =?us-ascii?Q?TPRfvnM7424BheVQBgkXJjkwwBNXLVwG1AM0VMEPXYBYrisvvfuZ72Cc3Shi?= =?us-ascii?Q?yZEGj0XfcevLMFLhPgOodO/JF3iWsvQPoWKRhQW9GpZ/8K5ZIoh7vcnl7UZZ?= =?us-ascii?Q?4MPPEZaKGaO4qegLd8Ds5IpOi3mhO6ro1jwajIbIj/wrwd+B3Sc1dQ/IIGMd?= =?us-ascii?Q?P0QMIQQqbVeG5EfBugkmannWBsnm3gubBkpix/H6pbngo/qZ3/A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2041; 6:YGMLmTkt7DsKEOoOLvrdAXQZq0Jf3Dv0KubSSysdrTL5F/8cYZ1AEUogougxC0EGhsdWgSB61HCxN3guuqmCZm2Mqgpr/g8Xq6y89w+HjYmVkqCmNx5rnwcy8nFzvlKSHa+wZ4XHzLrS43paVWbV5uoGZiDh5L6fRJcjQ9ULTG3qaoNqdVu8vPl0zWA/x6NvGaqQmj4yh95M0Ar/k5LZYDiJo/UswuVACCEVh9ZUP5joOwjGUnzpYzWKFaia5GQBqQ5UbgfLsz5hX+ZqIA+bxZCn7Amc1xa+ZykxJo81+qhEXzy/u8lzsyF4y9MFx3U7a5e6znp4YmbrEvhyuX4ITw==; 5:SoDR2hkEy4HeBwF6xd9ZSL/c0m/XbYD3+0zSDTUGls0f24n8TEyP9Tw58VJMD2NoCslD5OqBwxvSjvrBe7G/xM5nsDZe5eaBpIV299lP/HVjcLLAXmaqLqAr+oLIm6+EXBhGmNLkudGROX8QKACHRA==; 24:XKefxekjGKj8ePps1ildK3IVL4vkL7dBivImO6EL4/W3q/DBImzJNfTGAIzd/zJ+9Y/CHx1WzdGtHK7M7r37izG0q/ieidpeLtmz70kOKrI=; 7:s7nPRSEn0x5l2vhmpwWlsUw1iuHpFDJmmZR+hdnd9pnl4Mx1mLqT17dRzaq7iyiNQIONVa8nd5S4T5TH5XuIBac4Yo4LItIzwcaoPyPbAyJIHggjF9x+WEinnOy3lb9ae3OyWAMOdmvVdgxh7wW5SFkap3PqANlbKFtqqOAuNGW9jiL1aj7ad+GKNCE5kYAXI0P3x2M+pcjpWCXK18n5hjzjoDzlcEQYG9FcBjikoX4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2017 08:00:47.6215 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0501MB2041 Subject: [dpdk-stable] [PATCH] net/mlx5: fix Tx doorbell memory barrier X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Oct 2017 08:00:52 -0000 Configuring UAR as IO-mapped makes maximum throughput decline by noticeable amount. If UAR is configured as write-combining register, a write memory barrier is needed on ringing a doorbell. rte_wmb() is mostly effective when the size of a burst is comparatively small. Fixes: 9f9bebae5530 ("net/mlx5: don't map doorbell register to write combining") Cc: stable@dpdk.org Cc: Sagi Grimberg Cc: Alexander Solganik Signed-off-by: Yongseok Koh Acked-by: Shahaf Shuler --- drivers/net/mlx5/mlx5.c | 2 -- drivers/net/mlx5/mlx5_rxtx.c | 8 ++++---- drivers/net/mlx5/mlx5_rxtx.h | 6 +++++- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 4 ++-- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 4 ++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 89fdc134f..fcdcbc367 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1037,8 +1037,6 @@ rte_mlx5_pmd_init(void) * using this PMD, which is not supported in forked processes. */ setenv("RDMAV_HUGEPAGES_SAFE", "1", 1); - /* Don't map UAR to WC if BlueFlame is not used.*/ - setenv("MLX5_SHUT_UP_BF", "1", 1); /* Match the size of Rx completion entry to the size of a cacheline. */ if (RTE_CACHE_LINE_SIZE == 128) setenv("MLX5_CQE_SIZE", "128", 0); diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 961967bf4..f54fee9fb 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -732,7 +732,7 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) txq->stats.opackets += i; #endif /* Ring QP doorbell. */ - mlx5_tx_dbrec(txq, (volatile struct mlx5_wqe *)last_wqe); + mlx5_tx_dbrec(txq, (volatile struct mlx5_wqe *)last_wqe, 1); return i; } @@ -948,7 +948,7 @@ mlx5_tx_burst_mpw(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) /* Ring QP doorbell. */ if (mpw.state == MLX5_MPW_STATE_OPENED) mlx5_mpw_close(txq, &mpw); - mlx5_tx_dbrec(txq, mpw.wqe); + mlx5_tx_dbrec(txq, mpw.wqe, 1); txq->elts_head = elts_head; return i; } @@ -1245,7 +1245,7 @@ mlx5_tx_burst_mpw_inline(void *dpdk_txq, struct rte_mbuf **pkts, mlx5_mpw_inline_close(txq, &mpw); else if (mpw.state == MLX5_MPW_STATE_OPENED) mlx5_mpw_close(txq, &mpw); - mlx5_tx_dbrec(txq, mpw.wqe); + mlx5_tx_dbrec(txq, mpw.wqe, 1); txq->elts_head = elts_head; return i; } @@ -1596,7 +1596,7 @@ mlx5_tx_burst_empw(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) else if (mpw.state == MLX5_MPW_STATE_OPENED) mlx5_mpw_close(txq, &mpw); /* Ring QP doorbell. */ - mlx5_tx_dbrec(txq, mpw.wqe); + mlx5_tx_dbrec(txq, mpw.wqe, 1); txq->elts_head = elts_head; return i; } diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index ea037427b..58ae3c85b 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -584,9 +584,11 @@ mlx5_tx_mb2mr(struct mlx5_txq_data *txq, struct rte_mbuf *mb) * Pointer to TX queue structure. * @param wqe * Pointer to the last WQE posted in the NIC. + * @param mb + * Request for write memory barrier after BF update. */ static __rte_always_inline void -mlx5_tx_dbrec(struct mlx5_txq_data *txq, volatile struct mlx5_wqe *wqe) +mlx5_tx_dbrec(struct mlx5_txq_data *txq, volatile struct mlx5_wqe *wqe, int mb) { uint64_t *dst = (uint64_t *)((uintptr_t)txq->bf_reg); volatile uint64_t *src = ((volatile uint64_t *)wqe); @@ -596,6 +598,8 @@ mlx5_tx_dbrec(struct mlx5_txq_data *txq, volatile struct mlx5_wqe *wqe) /* Ensure ordering between DB record and BF copy. */ rte_wmb(); *dst = *src; + if (mb) + rte_wmb(); } #endif /* RTE_PMD_MLX5_RXTX_H_ */ diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h index 4cb7f2889..7a6e397de 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h @@ -225,7 +225,7 @@ txq_scatter_v(struct mlx5_txq_data *txq, struct rte_mbuf **pkts, #ifdef MLX5_PMD_SOFT_COUNTERS txq->stats.opackets += n; #endif - mlx5_tx_dbrec(txq, wqe); + mlx5_tx_dbrec(txq, wqe, 1); return n; } @@ -345,7 +345,7 @@ txq_burst_v(struct mlx5_txq_data *txq, struct rte_mbuf **pkts, uint16_t pkts_n, txq->wqe_ci += (nb_dword_in_hdr + pkts_n + (nb_dword_per_wqebb - 1)) / nb_dword_per_wqebb; /* Ring QP doorbell. */ - mlx5_tx_dbrec(txq, wqe); + mlx5_tx_dbrec(txq, wqe, pkts_n < MLX5_VPMD_TX_MAX_BURST); return pkts_n; } diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h index e9819b762..12d5bed55 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h @@ -226,7 +226,7 @@ txq_scatter_v(struct mlx5_txq_data *txq, struct rte_mbuf **pkts, #ifdef MLX5_PMD_SOFT_COUNTERS txq->stats.opackets += n; #endif - mlx5_tx_dbrec(txq, wqe); + mlx5_tx_dbrec(txq, wqe, 1); return n; } @@ -344,7 +344,7 @@ txq_burst_v(struct mlx5_txq_data *txq, struct rte_mbuf **pkts, uint16_t pkts_n, txq->wqe_ci += (nb_dword_in_hdr + pkts_n + (nb_dword_per_wqebb - 1)) / nb_dword_per_wqebb; /* Ring QP doorbell. */ - mlx5_tx_dbrec(txq, wqe); + mlx5_tx_dbrec(txq, wqe, pkts_n < MLX5_VPMD_TX_MAX_BURST); return pkts_n; } -- 2.11.0