From patchwork Wed Dec 6 14:48:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matan Azrad X-Patchwork-Id: 31948 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 53298199B0; Wed, 6 Dec 2017 15:48:59 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0057.outbound.protection.outlook.com [104.47.1.57]) by dpdk.org (Postfix) with ESMTP id 7D67A397D for ; Wed, 6 Dec 2017 15:48:55 +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=wLQsdaZPkneXyX8bncmHDmbDrwPPWeuVo03hiBRYQ6F8wkY9Sw/fVNz74vBhQbEKI8dnzRRaO575QvvgxkTLAVJXu3kyh29V5EJG1i+UzGSdVk4GLtWz41VrVEf8rrYeM6OITw53emn+921fs3qWQ3iSgiG9mN2rk7TNPiVEoW0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=matan@mellanox.com; Received: from mellanox.com (37.142.13.130) by HE1PR0502MB3659.eurprd05.prod.outlook.com (2603:10a6:7:85::17) 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 14:48:53 +0000 From: Matan Azrad To: Adrien Mazarguil Cc: dev@dpdk.org Date: Wed, 6 Dec 2017 14:48:08 +0000 Message-Id: <1512571693-15338-4-git-send-email-matan@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1512571693-15338-1-git-send-email-matan@mellanox.com> References: <1511871570-16826-1-git-send-email-matan@mellanox.com> <1512571693-15338-1-git-send-email-matan@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: HE1P191CA0003.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::13) To HE1PR0502MB3659.eurprd05.prod.outlook.com (2603:10a6:7:85::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e4a8ce9-736e-4a14-620e-08d53cb878ad X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603286); SRVR:HE1PR0502MB3659; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0502MB3659; 3:SnlxFrODTJRKV733CcxqGfKHHhmdt8WHxjUKHntBT7cOTC12v6mmPcVyYCj+ngBLB5KgNQcYU4Jpdp34NIUAobiqAJYh7Dlam7Zu+31GrwJejKTm6QxtmFZiItpWdN7tRnUJynVT6dRsoO13H/H1RnghyTz0a70T5rOp3o1f9UZm8xy+xg6dEwyYcSzDGPs1fHnXVGVGzn9atBJkjLP/yoe8+gFPhu8qjDMoGq9Ys92+y0mVtsVQaBCaKaJN6rCn; 25:Y0o9GXPLpkcOc5Is/FQk72ETkh+DY32i0K2jLVPmE8SpBVvS1iXSDlF+TBCoQxtzd73h862cvNnx5F4ZHt0mhpiyRvRuR3nX7oJwR+FFAP1wfTgZJXsqYCV+boIT3xrtEp1q+lCx5VYNRiGQazQubHX7TVdTNrcNiPKohmRgqUiOjnSvn//kvhHBe++UGWNZ7jCB6kPbNho5RR8/Ns3u+JBFXqStFfYJw+VpAl1uF0h5s3q6qahLuT2lAxUsU+drKXY7CLIxOPmXdY86jE5udkXIN0aNTPPQE7OxTH5pLKToQrxtnO5JCDwl9YniYH3aDglXr20M4oYkrt5bt+1d2g==; 31:VHmwyRCZwrC87YVwY5Rr8+uRnpaAjLsX14tHwSN7JXUVIPTnLTeTj4v1AWcDiSL0w9qjuEmuPhYgR4pLDXGP183qvWB6Cr9/4Vmlv+Ops+WBeIIJ/LUWGrO2qToX5igqHl1i5hT9CXWj9YyCeq7K6SvVIa7OxQKlfaQ1Gsl5hzczk8mUOcq/py9HxffJp2C19YuuGRgcrotT75kKIwEtAu+ZHOjgBFKQLO7aoCojQpk= X-MS-TrafficTypeDiagnostic: HE1PR0502MB3659: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR0502MB3659; 20:WfjQVb+mDgnFtJiYjBosVq0iyfRRfoRV+WjO1nYgaYHuZtEjYFdkgS0X2lUORfJag+jbBxQr4UR1ddjsugrBxAx35HEKg0ulVHzcJdSSRQyKs4l8PvTi8cBfBAl4IYz2tjAS81hyDQjmYm7YFUIXka3fptMxgvYtMT2AXU+gjXNysXVCKux35pyFivbyyeFDgSqVVI4966/gKqblr3EkopkjNVOzLZ1rmSDPMFnG7gNbDWSAqb/wcZSPCrFlpynqT4eKjjrBOczI0U5ZJnkM3YGGW4m/teg+MBoAYz1qv/8uKe3lpwKZIdTLn5cifFr9l0i7EIY1KeITc1lZ4Tq5thfRs63Gf4Ly7WZVhNDQczRcQPVvsrkraSmp3JA+uVcWPGp/LPtVb4c41yPeTvxKcdcFEfeSoL77g1Fi4Se7hEh0Nj1JAx4NmcNQt15ptQ25A7owiPyxuEZZM8l3qx0WV68yhLSlpJvylxzl61td1tcL7mjOITxoAnjEgDnkGUU5; 4:t9WXkQKd+LdSrc1kcwSzow4dRTg7OsvxftL/S/uBHJNmVGc6bn+y3wUIUtLoJbLHqXwyS16J1g/J2fYNwAr1WrS8XiURUNcg/RmCEk4D2Sf8NFUywKTUHSZAfXjKL9E3XrEzv/prFMl1bUgJZZZf2ryKVcfTLh4DYqmWQfsJNBIR5BfbTeBMhfMTBwgjejNukbOgNNKXuynDBmvsUtQZFPTb/qhxeNvvJ92qifAUVDx2LOgllF/+qIgFTime71na7vkIeHFWdE2h/loYYD9fnGOQ/N8zY5ObMGkbfpdzAA2Fa1kgGlIpITpkSY03dujN 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)(3231022)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123562025)(20161123564025)(201703131423075)(201703011903075)(201702281528075)(201703061421075)(20161123555025)(20161123560025)(20161123558100)(6072148)(201708071742011); SRVR:HE1PR0502MB3659; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR0502MB3659; X-Forefront-PRVS: 05134F8B4F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7966004)(366004)(39860400002)(346002)(376002)(189003)(199004)(6916009)(2950100002)(6116002)(4326008)(16526018)(6666003)(3846002)(47776003)(8936002)(76176011)(508600001)(8676002)(81166006)(101416001)(97736004)(33026002)(86362001)(55016002)(4720700003)(21086003)(81156014)(105586002)(7736002)(66066001)(25786009)(2906002)(69596002)(305945005)(5660300001)(106356001)(33646002)(50226002)(51416003)(50466002)(16586007)(7696005)(52116002)(316002)(53936002)(68736007)(36756003)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0502MB3659; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; HE1PR0502MB3659; 23:vkgxjnT2oSpEG6NPZN9ass0fh5sFiKUQv1B3vzv?= iVdELf57rS46mRgw/wehTl41ler9dqPqB5GsV190ILFikgnw07suNZFmX9jB8n0Dq6DWNDrfL7on63L+4Uub5eb7gdGTuhv99Eka+TvH1o7oy3lFCCr/Pre4lTKddvUJ9AwsTP8YYXjWszaJ0IX8QzBVkmLpyWgosHRylurp8bNwJC1sjbz/ymtp4dyj+sOPiN9y+aOrXWauwc6iGd88Ot4qzBuB9YIVCgnNT8UHvPtal6uPNRqGVxVn8KRjz3hdjZzsFa7bpS604z36+bbt4n++OHY0JFun8vEPXxKcjou/Z5UpAK53t7/5t/tzpn57flXP+xSXtGGs3uYMa0Q3Q22llliCMlsXABb/FJrb+vOh1eE8LWfzo2x9HNWaEyGcjxF9hcpH0WSusodwn8brRdjOmblr1vZEXRMjnKnvYPL4lESXqCh5bOQHxP9qWV4WV5qw751GLO7thLYxzHATQmUDFOj3xOsF/d2RaRtD6jP3RrgFN9qzmSyoydJyiexrY952ZSpVUWWcH5ehf+WlTUBlTS/zMv+aiKWWpOUALWPwh67s9jaN4sDtWSig+oRfSlQZM5n0jUoSP0kfctyfgDCpFIVxDanUVhl5gZMbOv+lOUJa39330Mv0AU/XwS4glGUxjalqYk8eU17cWv1QF+yV4fY4NLLxeSpa9J6cwxZ5yydIKWfwVYGUPGQir2nxOGwbFFH+U25Rt6J0P6eYo5P7/SIsOeqBcoaPMSs5U0xi7XwMuBj56/DznJPimewBKZi24/FlPjjII/wgjabubHCRXcrzbmggr5UXEHEv2PuGEBvDsXHCHg2Q0SCPf+HVJra0OVO2zVzLyfH9Z58HEmfG0W8+mZX0jBQIr+Zm7h4r2oIRFfefgsZlvJ7g+ALSEc1ndmCFcjhA931lJWeYx2/m4AOkQPobBZ9QHstfUbCWYF3ufor9EkuBAxHlRQ929IPfsE4Q1yj+o67w8QDItv27XdVY20rc0QjZr0brkSjk9IxX2+2ff7E1FdyQh2upTdPDHclllDxz+5GDoSOPjgOGSz4tp6sv5Q3Yb4w9wE1nwb4+V/HqkDWLt4rKJkcUxpUM/kUOH7GWIpwWrrS29eH1L X-Microsoft-Exchange-Diagnostics: 1; HE1PR0502MB3659; 6:KXFc5vwKqydV9hLQhiHDPLGYEqf1cbngG1Y1JV0mPi3B7WD/tVCDLfjZ30aK4T2NeJGj1HP1Q1W8OTJ7oDVNHGDf7Zgijba6UpUotKASBpKbsE3iPjpVQOgbbXThU8gwgUSTxgcLCeJlt5ck1sM1O16FYCHUfKNeDKCKYx6aK9eGa7gYt2N6jc4+c9pXAbtlfoJmNBAoxjA/oL3pxuchEpPDr+R/P1ulHNEGnTBMgG4F3/DOmnsOhCgLTqPWMr3VL+W5coKHCyrdF2k46TkD4xcRC7GsXoqQuxR29NZbqLoX66EDFI51uUpGxoDJBxmMdQIJMNTidzyiXGrYG2+0y2JFsyYBbi1paAMkdjsbKi0=; 5:8Diu9LtpxCVKI/yNIR+ph9qrDZBhqCBJzuR8Nsr0QL6JU0kcri9RVgCM20Ltrfm8zB7SIu5xDdFOfnPEKu2CWYUZufG7Hb3RW7smMTCgryL1iFyzbHX0ZkC91BI9CP1ukIe0Ot7Y+UQXG6Gaf7UXWEAtDL3j4lYaIVCnQA4xx3Y=; 24:cNkCMyuAMK3X/8KD8fUQzya/YKd+O2Qybi3e6/L6LFHaksZz/8uqfaCgD/3n1rOkbmBv5Zq6WrOXiRXbFK83K6A8y9TnE58aVSWg9EhZ4uc=; 7:tH3N7rqKYEdiIeoVoCgJ/qqzjnJWDPywF+P0AfDRlgIltDkf/U0AEqSX4Zsb8+5Jg0Mq8enEGT47ux1MWmud6p7PJq9MPIiACBantZoOjA3syjY/rJIi2s+ABkbOqbGC+zCCKUEwB6KO0XiA9jvOX3CfQK4poTfG+rYtob0luyk81HIQ1POYgx24fR7NPaD3SV3fUXntt24Cx3N+hP5/n9LTGYBddSPMUfmoibEiB4tycHIbvzXl6U3cMhKs6bDc SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2017 14:48:53.3758 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e4a8ce9-736e-4a14-620e-08d53cb878ad X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0502MB3659 Subject: [dpdk-dev] [PATCH v2 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; }