From patchwork Wed Dec 6 17:57:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matan Azrad X-Patchwork-Id: 31957 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 ECE2A199B5; Wed, 6 Dec 2017 18:58:14 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0074.outbound.protection.outlook.com [104.47.0.74]) by dpdk.org (Postfix) with ESMTP id BDAE7397D for ; Wed, 6 Dec 2017 18:58:11 +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=0l0qqUETH1biXoofqpbbwOniRElZFppBimtj7LpjwFE=; b=vrosKdbcdqPaAJGG+fe+hhlBfTOsXZRwGyy1uPqR7wwQc7atww8sD/ACh3KcD6qJNFPXyZ7u3TI/Ey7xPzGYFwZtnnPUvuQoum7vKCArkNmcIbYM4w+PQjHgrUN4qcg106a+4I1iieL52zum+XA1p04/AISKEHym0/xjNzdtBsc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=matan@mellanox.com; Received: from mellanox.com (37.142.13.130) by AM0PR0502MB3650.eurprd05.prod.outlook.com (2603:10a6:208:1d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Wed, 6 Dec 2017 17:58:10 +0000 From: Matan Azrad To: Adrien Mazarguil Cc: dev@dpdk.org Date: Wed, 6 Dec 2017 17:57:51 +0000 Message-Id: <1512583076-5592-4-git-send-email-matan@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1512583076-5592-1-git-send-email-matan@mellanox.com> References: <1512571693-15338-1-git-send-email-matan@mellanox.com> <1512583076-5592-1-git-send-email-matan@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: AM5PR0701CA0023.eurprd07.prod.outlook.com (2603:10a6:203:51::33) To AM0PR0502MB3650.eurprd05.prod.outlook.com (2603:10a6:208:1d::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4c16bf45-27b2-4d12-759d-08d53cd2e9c7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603286); SRVR:AM0PR0502MB3650; X-Microsoft-Exchange-Diagnostics: 1; AM0PR0502MB3650; 3:bieDN3nQY+FmaSAhMKC1frIWmqFmIb6Bu6cRuZ8W9N+t0uVKyNs+rut3u9aMYuUBE3MGRyDQEsbGRGTQ/iTR9+v1XDKb2VuPCsf1wS7SzCKr9JgPXnCRrqC+/zgAq2gy8nFhEH0/5y5bPPFxbsauhbk1I//lI0Tb66bx7fB8nBrCb/Sxvi60vSrUknHxwvMw2Y/5VcV2AxHk8wwciOwaoV9bqApUlf3IwR3n+RC4OqiF8QURsNs7+EOwkWXDpi5O; 25:8rfloVdiLax4ia3DnEe61ovyqMjK8aNQHArOl3Jt2ldkk07jJTuT4pA5QYteZHzmmDOi/kpI57gVSzxTZENcs3dcC6YKRatCIDDE4U9mCfiFR7HOUNwW0zLs4mOw0IwaEtmri6juQVJz1XtoGSK+6dBWuzR31dGjANMnHdxK9ONwT6Oep4wXwocJIgdWhWb1HXZSUX197SRT0ME/dI6ZTgnKz5s99XzjmQJKPkMv1LqBE+u4RKeNcu4FNCIk1Hxe8OrH1SXlcQbRaF6GlNEvcdXIL87pcxtyCd4PoQko6sSLntvkw0SLAaVUBuD4dRMgYaA99dZNPhhYjAGnyZ7X7A==; 31:kMQKZi3aW490JOZOsQ9k6H/U/qXRudH4bsWCnM4kdGMzDaVkHLFwMxH2wWATx1+hPvh4v+BVEUQDBJNMv+PoYn/Te1pf4fm+XDERP64WvMo9mNp97sdt1YURb6EQQkjcVhQed2Sf26PkFYlsL3R1Cgo0GEillbTc7MjyxRPF4TqXgRUbTCE/U2k37n5fMa8SBl1gN3La1AMebIwTCx3UzMN8ereq3XPiqxVgYdWTJaE= X-MS-TrafficTypeDiagnostic: AM0PR0502MB3650: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM0PR0502MB3650; 20:i4nvLwT+u8wWmdISDKq6PzxsuGOgENlpfKG/v8PyjlJessuz7gVIUJyxzNmRBFsDNB3mZquKE9FDMpaiNf4ffW1OI4stm0Ey0/hCnmKbY+pJ/0IxcjN8Bh6S8shAirzxHC17ymnpChHJI2IJg6fyHe5c43S+GWNKyNmdmwVzCsVB7oMrcdFHeYb8gnv/7eBZLmSpK/7uUE4Wl0Nqk7Fix0215JZgA/ez2QtAjXTdSTR1HpQAbhh5ajqQ4bEHn+9oCyvqxq+JcefOK6O/hUyYKJU6sThS2X8DHjHzntZ6CRlcuBpMxPVAgSa03bN8j1taa6XX09pGnl+DEhVGcaZVuo+6NYjZw+dpkP2xu2aRA7agTbTz8mNp0tRT+oKP1w5ZnAPk812nPINcbd+VShhL9EOncQmQWmCsU+BwV4t3XL1Yltn83IXSA54ZKOtOnRvkzKCtwGJRenVEzYQBIRSYcj9L+f1AnX9III66Bp0a+td466AQWEDoC0xKfSiYLKKl; 4:FpcekzXHjw6g3CTHkEpT48CwRkE3Mjzh07DgbF0KO7FyvO8+sgIFpmrSXB35kHQzf0owyYcg3mdqhJYYd2PUa02GU7MeRSnkaV7zllLNThyFywBoSqatirv2dRP5WjvTxaU+IQnglHhl7hRX92qonBxKnp1z6YAYjk+NcaQeZBgXXECzK0E4F4aLw0AuBijxRb/+anQBtOcXtWgyfCgu2rlnsbLaJ0FNgOAZDfMH66GCvG6Xnpn5DB2faSbAdxZehx5bYH8PJEuV7DCtMaVfQ6xgs7UyvXPlof5kmwj1JYRMEXHfKKSQ6zOSKi+yPEim X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(60795455431006); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(3231022)(10201501046)(6055026)(6041248)(20161123562025)(20161123555025)(20161123560025)(201703131423075)(201703011903075)(201702281528075)(201703061421075)(20161123564025)(20161123558100)(6072148)(201708071742011); SRVR:AM0PR0502MB3650; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM0PR0502MB3650; X-Forefront-PRVS: 05134F8B4F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7966004)(366004)(39860400002)(376002)(346002)(199004)(189003)(25786009)(4720700003)(4326008)(2906002)(51416003)(5660300001)(106356001)(76176011)(8936002)(53936002)(7696005)(105586002)(16526018)(68736007)(33646002)(55016002)(3846002)(101416001)(6116002)(86362001)(305945005)(21086003)(48376002)(66066001)(6666003)(81156014)(47776003)(316002)(8676002)(508600001)(7736002)(97736004)(81166006)(69596002)(36756003)(50226002)(52116002)(6916009)(2950100002)(33026002)(16586007)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0502MB3650; 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; AM0PR0502MB3650; 23:qHEig7ZLkdOF9QST3xu0OP/trqHnZa8ZIy/BLb8?= D0J6fQvOk+XbRgpRU93gTqquIeOaJYI/xQ33oL7G8tFXSXWluRUoA6GZcOU0WwYi6586iyZhfOdEU5F7j+wCRxvloMOEVGfjBHLe549avgAEF0EZ314LyrnLqQZhIsp+zIJfC9XJ1tO8nbq+lKp7MwFxCWqnVgtF3FUJYkSBXVwZfSE0ydkS7byg1KFCMQagrXFjuECa7f8tkGYQODz5F0ZqJC5wZmVFsfFvUbFhQBbGDlPDRMI9QxXEOuprNZDuvKBAgzEGTep/kOKKyYTunxmfWm7z/5MbxwPq7tpoi6sEZylfXqDf9cdzI8T8FHWDIDWiq8K/ogOJPIEpaX19N1E0bHNm9a/M94UT3WSWjrXeivL09G10mP+LUvcou+B31g95wSmPvi5Q4X0wPstlm500+6U2b0TbY6cwwucpUsuPEDcTJvietaMpU+8Kd20oECN4TYgKyb6W/8iBFWlCA/8uagPECXuChqJNfUR/W1RwxFyFBJ8+RflMtJfuow3bvjRePTpJdsLdvjBCiE9U1TcIkLOQVgWdZiHENiwZbXqCASjaIl19Py8XC7z8lPrUQXBg6NICCDsrRHWTh/ylZDyQgSIMd9plh9E891xzK9ySdXYWKZLmNc2Yp6dw70LP0ET8Qpq2jBeNL3KElGFgmd2AM/v35VvTL01k9VWUhMMml8D7oFjmAKb1wQ1pT674LsD5ZpLo8auIj+lIZG0qPxVJ/m5E/Y77eEhJ+HdS2fBHVU1IlFeD4FdG+PjLFFmqb/GR1vEBj0G169AqVWQPypW7nB9hliz1G5GBT25C3fwEL+OmOlK5pdq+lJsGy1dChy3F0PZCFDe57yYHhkxTuQXnYKDYixE15LANMpiRvvLtdk5Gs63CNOpUXMXJIQpupzBhG30sXn43kgsfC348bBDxg6kT6w77iv/dHOi1a0gTzXLxb+L18VGu6TFpo5zMQMGbvIDT9ug95BJ3hGTrPO9YEcAvIZ7NiKHxNQf7/eiEcrof5L0WNFl6ca0ezWh9Sh4PDd564+p63haUWu6zrBfvGbvJG3oZuG4ozSh7kHOtgqeMDG6Ddyv8IzeV/5PPKHA/H8h1WqUSQLueOovkuuO+W X-Microsoft-Exchange-Diagnostics: 1; AM0PR0502MB3650; 6:BSnBhRt/KPXVy7pBEZhvq5q3gB7pvEkyuqxngbfj/6BGEM315ISmG9/34CnklbnGhpXVsAeBNg9gAiitZGHBp9GWDaWT8KbH/I4gUA5gQn9IRCa9JkcIrJZX5HjI9C3aKl6O18BLBxFUcc+vE4FfV85cvaMHoeDEuhu3poWjkEmYZdJRgNA4B0fRZFLuoivd3llyq13H5asMEvWkevealvhX3YCHr6mi7t/TX+paEeQ9vm4IfoQeRuPf63Oidjx9A8Z/mki/HgoQJhj9yLalEFh6wUSnO8WSjxspHyvm5n6sICz4CM1vbd8NEynpUjnEKQ4F9lopj33mG2AptEp62hTfR0VQYCyU2rKY96Ou3wk=; 5:No9BbOkFdGho51ICjySRxgiC8oOV0Yl9htPJ+vyEGBi1t9GdDNpnH8DyJQt1J0kP8ZJy+o/ygGPBKWFnbVjHNkN3Ojhe1MbWJRdCFyid9aBCJ0tlc1B3egcJJoe30O/yDRlMD8hPP0z/XwDJDurwUS7KIbhLr5ZPVJv+tDwdyxw=; 24:6UWQbxZPbnJ58B02whLYII0rnjGhn4/xEH+33hu6EtU678KrG3wgTcCrqKePoEHg4wld4Fq6e+ALXNeezLHXdD54S0DLLMaYPSyoarqwKqI=; 7:jHROeImdkGlex5xOoWGewzFq3cTbYeWx3MRqJ02g0Z4jFYlAEtqhKJlUUuRFFbOYKFBoWZ2qwNN2UsvOhbFo25IZCFalocHjYk32xrbCkOwUX6zTr2lgUrBt3QikQTA0czI2HDwatB9spuUh7se8VSMb2JpMi/SeUk+7BX+CbocH1J5EPv6kzR0TMn6NR86G2kl+o5x1qDx2INlXf1j8aDGbkossSxZlsi4f0re59kdBoyYDY+qKI6m+D2nm990u SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2017 17:58:10.1380 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4c16bf45-27b2-4d12-759d-08d53cd2e9c7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3650 Subject: [dpdk-dev] [PATCH v3 3/8] net/mlx4: remove restamping from Tx error path 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" At error time, the first 4 bytes of each WQE Tx block still have not writen, so no need to stamp them because they are already stamped. Signed-off-by: Matan Azrad Acked-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4_rxtx.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/drivers/net/mlx4/mlx4_rxtx.c b/drivers/net/mlx4/mlx4_rxtx.c index 9a32b3f..1d8240a 100644 --- a/drivers/net/mlx4/mlx4_rxtx.c +++ b/drivers/net/mlx4/mlx4_rxtx.c @@ -468,17 +468,7 @@ struct pv { if (unlikely(lkey == rte_cpu_to_be_32((uint32_t)-1))) { /* MR does not exist. */ DEBUG("%p: unable to get MP <-> MR association", - (void *)txq); - /* - * Restamp entry in case of failure. - * Make sure that size is written correctly - * Note that we give ownership to the SW, not the HW. - */ - wqe_real_size = sizeof(struct mlx4_wqe_ctrl_seg) + - buf->nb_segs * sizeof(struct mlx4_wqe_data_seg); - ctrl->fence_size = (wqe_real_size >> 4) & 0x3f; - mlx4_txq_stamp_freed_wqe(sq, head_idx, - (sq->head & sq->txbb_cnt) ? 0 : 1); + (void *)txq); return -1; } if (likely(sbuf->data_len)) { @@ -639,16 +629,6 @@ struct pv { /* MR does not exist. */ DEBUG("%p: unable to get MP <-> MR association", (void *)txq); - /* - * Restamp entry in case of failure. - * Make sure that size is written correctly - * Note that we give ownership to the SW, - * not the HW. - */ - ctrl->fence_size = - (WQE_ONE_DATA_SEG_SIZE >> 4) & 0x3f; - mlx4_txq_stamp_freed_wqe(sq, head_idx, - (sq->head & sq->txbb_cnt) ? 0 : 1); elt->buf = NULL; break; }