From patchwork Tue Nov 28 12:19:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matan Azrad X-Patchwork-Id: 31717 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 BDDA13790; Tue, 28 Nov 2017 13:20:09 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0040.outbound.protection.outlook.com [104.47.1.40]) by dpdk.org (Postfix) with ESMTP id 8E9793230 for ; Tue, 28 Nov 2017 13:20:03 +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=2sl1Fo7HRebneir5E0UPggkqW1WjgrzJGsdWk/cwRqE=; b=iKq/S7JSGc8ebhOLMRFShvXYMlHUi+BYK9cAeRqAr5bDH4TsD2wjiqxLg2enyqPQ71SNUAw6uiupawgV4Z6kkA114+K+s48GQIhgNeohgPYTXzPFpDhvtzHY9AwqDHwr7cBg6UHCNK2Zgu5aqv1TD6NA5KcZWCV4gGXWRdl8v4w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=matan@mellanox.com; Received: from mellanox.com (37.142.13.130) by AM6PR0502MB3653.eurprd05.prod.outlook.com (2603:10a6:209:9::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.260.4; Tue, 28 Nov 2017 12:20:01 +0000 From: Matan Azrad To: Adrien Mazarguil Cc: dev@dpdk.org Date: Tue, 28 Nov 2017 12:19:25 +0000 Message-Id: <1511871570-16826-4-git-send-email-matan@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1511871570-16826-1-git-send-email-matan@mellanox.com> References: <1511871570-16826-1-git-send-email-matan@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: DB6P193CA0012.EURP193.PROD.OUTLOOK.COM (2603:10a6:6:29::22) To AM6PR0502MB3653.eurprd05.prod.outlook.com (2603:10a6:209:9::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1893a379-5e97-4569-9c18-08d5365a59a7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603199); SRVR:AM6PR0502MB3653; X-Microsoft-Exchange-Diagnostics: 1; AM6PR0502MB3653; 3:G3kwfdsSv6OS68JgW3fWJyHsWs1DEqo2o3QIyHW37IWIY4hNRDoeUbMESgiOg346xCCotTMoEz62j8MzRpQbZxa5xXrN3LSWZVyfaT4aFg36f0B0NcwJH7lUX6dQnxGhk89mO5q8/hix0ATYRst3Iyq1VNatb0xB8tbim1rXiBopjMyDflhcmhqt2sJ+nUTimufTB+84K+eadalT0ItGFeSAkoUUGjc46qVJ1MomUa56M4g+CkVto+IfOrRsENbP; 25:shlB5vw3dCi15spmxZ8h6Bb6ApkoUU2l39Z6fdXkvZ89eZQPLVBjFr1EiX8WFYAeD07VsKjOgO5M+QXwoB3d9guKSsTST9+1py456M20ZsR3SaFfbFSZAYlxhFZQasJ3z/bUHBAYMrDRz8CCrCB4ckY48vvXnNMcWDRjzeaWRKxrUwbhcV3hBlxQQ/5udwMhe4KJnWQsdKwHNW23tDB7xXMT/cleMWKOFiukim5zn4wz74W3ddXmwEvpfr5t76sz8NXA/WW4zUwnCzBWXuBRAr2EjD+Bkstd2Zn+1lsOA8K9xzozHrw31INPSp37RoxT5by+kuaj2AHQXsopoEpaZpM41dog/TBV9VpSP1oOBxU=; 31:qU+v2yVP2uqfMXEZrgfxdVYOsnSbPex28hAgg2YOnccjCcX5Wi7Sn1pGd4huve2SbZLTyqu87sT22cDfh1XgXGHIOYvl2HEADbCNEQj8t1ai3jPrRFIrXBydOkS0Uq53SU7eWCAhbCgIrs9s0OuMitAISWdPDA/yZPC/Jsc3Cb2QBtG8Ekj5ogH7wYtDL7cTGEEPwN1HNEIHO3XhuAZrHvtfs0q5Y6gQ6cDT4zZEBqU= X-MS-TrafficTypeDiagnostic: AM6PR0502MB3653: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM6PR0502MB3653; 20:ksWz2orpugDeAWTTJkq0QXLBh73d9l6Tim6PNMPrr4gWvjJiNanOExjeQYSF/owKQCHUi8i9oWcQejvccxfZxxHcu6lnMobqJ3tZHMYtWAICOAPHf1pDj8gObVQOtoias0gvmwb03ztVT4l70SlUISYa5cwJfHI8DwJmdVLKoJesC7ZZCBM1mFoWVEPBuivGg4v+JjIhD4UAFVwCJrR63xRiIhWT20YaHl3i+sfZqdBF52fczmWcxvGcPlg34OdGeqT2W2BzXScbDfOa0gmMLDoUVvnpAD6uNvhfW4+wzR99fzcvuYrk/zy4Gelzl6+vxoHyYBNlEgnqlWjleEEu16D1WUJ48ajWvum0X3lXDJsFyhhgl6AQjSQgYs7M5MuK1P5umUxo6xQoAGByM4Bp7vyONSaonzswup4gb9Mj2RQzlAkcnbNLzOe9RWGekWPGSGjvL+5KJ7+23QwNkNqK52bVOszPCi8bgFuMfaJedl5KOVD0pV1TURwjhhcTOluP; 4:SdBEVDzv4qfYu0niRq4ML9x9Gu9mnfNiXC9BVnK6jhysptMNtMmMTddAgfecC2wmdkhqLwryMy7yI13+t05Y7yI38CUAaJeHAwBFTfzIJapTVdPgdLjbt3OJJ9QOLMeBzkjtG3hx14NYMWmdvkxmFZ+gC3klZSyH0gEbRQjwdzchlORxVc9WmsAzy49q3dibJjUs1229/E2ZgWOna660x/yYJwTxTjz1876ZpNud3E91eodhc5aGp9wHiYM9Wt5ySqqhdnLowkWl4FVB1XLmQlzoOZacmuEH3tLW6U5IeeGUlz19TdP+vqcdaUs5rYyv X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(60795455431006); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(3231022)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041248)(20161123562025)(20161123558100)(20161123555025)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:AM6PR0502MB3653; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM6PR0502MB3653; X-Forefront-PRVS: 0505147DDB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(366004)(39860400002)(199003)(189002)(101416001)(76176999)(86362001)(50986999)(4720700003)(8676002)(81166006)(81156014)(6666003)(36756003)(55016002)(33646002)(106356001)(105586002)(2950100002)(6916009)(4326008)(478600001)(189998001)(48376002)(25786009)(68736007)(2906002)(50466002)(52116002)(21086003)(53936002)(8936002)(47776003)(33026002)(66066001)(5660300001)(50226002)(6116002)(3846002)(316002)(7736002)(305945005)(97736004)(51416003)(69596002)(7696005)(16586007)(16526018); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR0502MB3653; 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; AM6PR0502MB3653; 23:iJeabd3FMRKQgVOyHiic/aBu/fGkWQQ6bIkZ8Ni?= 2e7kgr0uYDCtLw0ZjqUWjYvKDfhsr1tDcnlTGl3Kspf5fWW+5pqIthvLtHyT5i2ywqibmVBNrZ12TcpF9DPOZoMWMi50ke1yvnEhLjEATJ+L1xS+0IhrxysfMxt75KPlSTX0b4sVuYN7zAV7y8AV4fCWMObX/J4AsZrL6q9aG4JiLEuASdzT+t/cwY2QYES8Sg6xCw4kOVNhw5m7ZR1sCsznLR9bVluyohFlVzQATCxtk8+xjdfFo+EmhcaD2eT3rObypxRf22qSx6djLyS4P7Xgsmp15WtAQERfwuwcxH1QUWziWfo8CsH+zkzUjLLdrflg1UqmH+IYS+AN/k1LQ+YYqMHw+LYLJPCLcSQy/4cbH5Ldyo+DE7YlK2SUGIPyuZ6BQFk2xpub8MtSnQeCDwv0m9V6uZIVTbXyHI83koXVXwfB87+0WdT24GEsUkJjR1tqk13Nctse9HoV6D1KIwCti/kyoaUZq90RGsL/FuxhIcYNEsXXZOzcM8cJXHGTUvRroPHod1Ix5mKnOevigoElPQ4VpM/j1HnYpR2XjwlXa38U4aK0PG2Q3zsBSA7FnAoR2fY+5lC26+QyTfWV5VqkXnITvPwC/K1rgWS7ImoG8BREhsbecKg9dUiKuwrrE32QTF7+sJ30zuKSiNYlCOYkqStP0JpDBWOTUxOpfRj+YoE/5Fk3h5lDtjWH1H21TEnZTdyK1B+Oxy9WiyHOCs5DDZb+Eyv930jELxKG0KxEHz+pL+pVfJzWQEMc+ZOGF2uhyjmTdyFtH92W7klF10AEFL/WvVfSYO+ue/FzCeOlQoXYCLHXhqbm8O2/3WzruAt5xuBtqFNxHgoEFswefUmAUoRdi4ul4I0valDp4JWDXhZ8BQ8pbwZ9a/YdG52RI8EUDv+TqTVPSfzZ15C+AuxjY+DhER/9na73KZ68dHwlJ6T0QzaE69u/Xj3KHPqnFh/5gN/xivHZ5/cMs+qMjN1iCfByKqDxNDjo70I8XuYlVnaKmLBtS17/WaYmVHn7lCEyDa431bSpuZgTeSrxvcCaTYfQbOGBVN788igHQFO841wEzczLC2qvsL4GCqvipRTM5aOMTRiwkxgSwPEobQn7qeUktJKnzaE4nYyVVidO632e4+i9x1NP2o9On0CKoMuo= X-Microsoft-Exchange-Diagnostics: 1; AM6PR0502MB3653; 6:w1WIHEgfG0ESDTt7qqBk7TCCjRR83s165OtLrvKE6MenuALZO1t/uuE4/5lEbddzkKBuvguPVS6sN3YPdpn8frdBKfOm6rnhjdfmR4qfhFebBgHlqDxcouFXCNGkI9yEBQmxOJJ5iz8HCup2CAjJePGxwPkswJobwsIN4ajsf58pL8irUyQY590vkmLTuqZtR1NPZrdih0MGXgB0CtxrL0zdCEDzGVAJ8dCdFAVEy3gIy3jbz5B1v5KRws8IUY9TAZSqwB1XXW0N722CjfzAVeAcIXuF0SBvKp8t1K2cE4Pm5ce/nVErXIq7J7NxlAnKOgu15LvAhccE2y319xUxcE0mKYu27axy0nc0aCkDXOg=; 5:ZHQi34CO6uOdLpKOJKuz2U4tSRa4ho6Fy8c5M1GAS6eR4u/UnFSosk8c+wV4WOUdsLvNs9EjOfo6Eoo2viilCNXlIOWsW8LKowJfFruC6n7LBlUiPl0Ag54B5fzKTL9EY6MgVLVt0i2gUSyTH+1zFHIqLVmHfJqqN/GQn8ydF8Y=; 24:jpiK9dRCAi86esDIrKevfjnQ4y9DKVyNov21wNpLerrqPGQMzHW2SLd69rz1KrZVExdwpIY1/8mAE1x74XAs7aahZWuroOYO4qWCrhC5Brs=; 7:vxOp8Gg9+WHh/moz7CS/vV5PIKN5fch7rJsPoqTxRErFbDeIheGp6rNF8PFWC4FbWlgXviLcotouL0/CsoTcsSCpelZUunyLaqD0GcA4vjLS5O0XT5KSlXoXYhdCl0aYlClUhrpbouVBTPyBRU+C04hTCCHQDCEJ7EWbXAC0hTRMNsP1a9o+Sz4fRiQ7JVMPPYRifKoPeB16+L/5tAiHqt3XBBARGdNOuG47k7cZPEObFpGSxc79PMYmrwb3UXqv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2017 12:20:01.6437 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1893a379-5e97-4569-9c18-08d5365a59a7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0502MB3653 Subject: [dpdk-dev] [PATCH 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; }